patch-2.4.0-test10 linux/arch/m68k/amiga/config.c

• Lines: 62
• Date: Mon Oct 16 12:51:16 2000
• Orig file: v2.4.0-test9/linux/arch/m68k/amiga/config.c
• Orig date: Wed Jan 26 12:44:20 2000

diff -u --recursive --new-file v2.4.0-test9/linux/arch/m68k/amiga/config.c linux/arch/m68k/amiga/config.c
@@ -20,7 +20,9 @@
 #include <linux/tty.h>
 #include <linux/console.h>
 #include <linux/init.h>
+#ifdef CONFIG_ZORRO
 #include <linux/zorro.h>
+#endif
 
 #include <asm/bootinfo.h>
 #include <asm/setup.h>
@@ -89,17 +91,10 @@
 #endif
 
 static struct console amiga_console_driver = {
-	"debug",
-	NULL,			/* write */
-	NULL,			/* read */
-	NULL,			/* device */
-	amiga_wait_key,		/* wait_key */
-	NULL,			/* unblank */
-	NULL,			/* setup */
-	CON_PRINTBUFFER,
-	-1,
-	0,
-	NULL
+	name:		"debug",
+	wait_key:	amiga_wait_key,
+	flags:		CON_PRINTBUFFER,
+	index:		-1,
 };
 
 #ifdef CONFIG_MAGIC_SYSRQ
@@ -168,6 +163,7 @@
 	    break;
 
 	case BI_AMIGA_AUTOCON:
+#ifdef CONFIG_ZORRO
 	    if (zorro_num_autocon < ZORRO_NUM_AUTO) {
 		const struct ConfigDev *cd = (struct ConfigDev *)data;
 		struct zorro_dev *dev = &zorro_autocon[zorro_num_autocon++];
@@ -178,6 +174,7 @@
 		dev->resource.end = dev->resource.start+cd->cd_BoardSize-1;
 	    } else
 		printk("amiga_parse_bootinfo: too many AutoConfig devices\n");
+#endif
 	    break;
 
 	case BI_AMIGA_SERPER:
@@ -1004,11 +1001,13 @@
     AMIGAHW_ANNOUNCE(ALICE_NTSC, "NTSC Alice 8374");
     AMIGAHW_ANNOUNCE(MAGIC_REKICK, "Magic Hard Rekick");
     AMIGAHW_ANNOUNCE(PCMCIA, "PCMCIA Slot");
+#ifdef CONFIG_ZORRO
     if (AMIGAHW_PRESENT(ZORRO))
 	len += sprintf(buffer+len, "\tZorro II%s AutoConfig: %d Expansion "
 				   "Device%s\n",
 		       AMIGAHW_PRESENT(ZORRO3) ? "I" : "",
 		       zorro_num_autocon, zorro_num_autocon == 1 ? "" : "s");
+#endif
 
 #undef AMIGAHW_ANNOUNCE