Merge with Linux 2.4.0-test10.

11 files changed, 29 insertions, 56 deletions

diff --git a/arch/m68k/amiga/amiga_ksyms.c b/arch/m68k/amiga/amiga_ksyms.c
index 9b686100a..e9fee546e 100644
--- a/arch/m68k/amiga/amiga_ksyms.c
+++ b/arch/m68k/amiga/amiga_ksyms.c
@@ -1,7 +1,6 @@
 #include <linux/config.h>
 #include <linux/module.h>
 #include <linux/types.h>
-#include <linux/zorro.h>
 #include <asm/ptrace.h>
 #include <asm/amigahw.h>
 #include <asm/amigaints.h>
diff --git a/arch/m68k/amiga/chipram.c b/arch/m68k/amiga/chipram.c
index 43df3f6c2..b7f9f0508 100644
--- a/arch/m68k/amiga/chipram.c
+++ b/arch/m68k/amiga/chipram.c
@@ -8,7 +8,7 @@
 #include <linux/types.h>
 #include <linux/kernel.h>
 #include <linux/init.h>
-#include <linux/zorro.h>
+#include <linux/ioport.h>
 #include <asm/amigahw.h>
 
 struct chip_desc {
diff --git a/arch/m68k/amiga/config.c b/arch/m68k/amiga/config.c
index 3eca427f5..528f206ff 100644
--- a/arch/m68k/amiga/config.c
+++ b/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 @@ static void amiga_heartbeat(int on);
 #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 @@ int amiga_parse_bootinfo(const struct bi_record *record)
 	    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 @@ int amiga_parse_bootinfo(const struct bi_record *record)
 		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 @@ static int amiga_get_hardware_list(char *buffer)
     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
 
diff --git a/arch/m68k/atari/debug.c b/arch/m68k/atari/debug.c
index e30cb4e55..2900f7758 100644
--- a/arch/m68k/atari/debug.c
+++ b/arch/m68k/atari/debug.c
@@ -31,17 +31,9 @@ int atari_SCC_init_done = 0;
 int atari_SCC_reset_done = 0;
 
 static struct console atari_console_driver = {
-	"debug",
-	NULL,			/* write */
-	NULL,			/* read */
-	NULL,			/* device */
-	NULL,			/* wait_key */
-	NULL,			/* unblank */
-	NULL,			/* setup */
-	CON_PRINTBUFFER,
-	-1,
-	0,
-	NULL
+	name:		"debug",
+	flags:		CON_PRINTBUFFER,
+	index:		-1,
 };
 
 
diff --git a/arch/m68k/config.in b/arch/m68k/config.in
index 83381857f..b06fdb516 100644
--- a/arch/m68k/config.in
+++ b/arch/m68k/config.in
@@ -139,9 +139,8 @@ if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
    fi
 fi
 
-if [ "$CONFIG_PCI" = "y" ]; then
-  source drivers/pci/Config.in
-fi
+source drivers/pci/Config.in
+source drivers/zorro/Config.in
 
 endmenu
 
diff --git a/arch/m68k/kernel/semaphore.c b/arch/m68k/kernel/semaphore.c
index b873ee9c7..139a75b64 100644
--- a/arch/m68k/kernel/semaphore.c
+++ b/arch/m68k/kernel/semaphore.c
@@ -182,7 +182,7 @@ void down_write_failed(struct rw_semaphore *sem)
 	while (atomic_read(&sem->count) < 0) {
 		set_task_state(current, TASK_UNINTERRUPTIBLE | TASK_EXCLUSIVE);
 		if (atomic_read(&sem->count) >= 0)
-			break;	/* we must attempt to aquire or bias the lock */
+			break;	/* we must attempt to acquire or bias the lock */
 		schedule();
 	}
 
diff --git a/arch/m68k/kernel/setup.c b/arch/m68k/kernel/setup.c
index 7a6637a2e..a2e3f47f1 100644
--- a/arch/m68k/kernel/setup.c
+++ b/arch/m68k/kernel/setup.c
@@ -68,13 +68,13 @@ char saved_command_line[CL_SIZE];
 
 char m68k_debug_device[6] = "";
 
-void (*mach_sched_init) (void (*handler)(int, void *, struct pt_regs *)) __initdata;
+void (*mach_sched_init) (void (*handler)(int, void *, struct pt_regs *)) __initdata = NULL;
 /* machine dependent keyboard functions */
-int (*mach_keyb_init) (void) __initdata;
+int (*mach_keyb_init) (void) __initdata = NULL;
 int (*mach_kbdrate) (struct kbd_repeat *) = NULL;
 void (*mach_kbd_leds) (unsigned int) = NULL;
 /* machine dependent irq functions */
-void (*mach_init_IRQ) (void) __initdata;
+void (*mach_init_IRQ) (void) __initdata = NULL;
 void (*(*mach_default_handler)[]) (int, void *, struct pt_regs *) = NULL;
 void (*mach_get_model) (char *model) = NULL;
 int (*mach_get_hardware_list) (char *buffer) = NULL;
@@ -365,7 +365,7 @@ void __init setup_arch(char **cmdline_p)
 		high_memory += m68k_memory[i].size;
 	}
 
-	availmem += init_bootmem_node(0, availmem >> PAGE_SHIFT,
+	availmem += init_bootmem_node(NODE_DATA(0), availmem >> PAGE_SHIFT,
 				      startmem >> PAGE_SHIFT, endmem >> PAGE_SHIFT);
 
 	for (i = 0; i < m68k_num_memory; i++)
diff --git a/arch/m68k/mac/config.c b/arch/m68k/mac/config.c
index c1154b6aa..a0486cf95 100644
--- a/arch/m68k/mac/config.c
+++ b/arch/m68k/mac/config.c
@@ -127,7 +127,6 @@ void mac_waitbut (void)
 }
 #endif
 
-extern struct consw fb_con;
 extern struct fb_info *mac_fb_init(long *);
 
 extern void mac_default_handler(int, void *, struct pt_regs *);
diff --git a/arch/m68k/mac/debug.c b/arch/m68k/mac/debug.c
index fa3910b5e..330d30955 100644
--- a/arch/m68k/mac/debug.c
+++ b/arch/m68k/mac/debug.c
@@ -159,17 +159,9 @@ int mac_SCC_reset_done = 0;
 static int scc_port = -1;
 
 static struct console mac_console_driver = {
-	"debug",
-	NULL,			/* write */
-	NULL,			/* read */
-	NULL,			/* device */
-	NULL,			/* wait_key */
-	NULL,			/* unblank */
-	NULL,			/* setup */
-	CON_PRINTBUFFER,
-	-1,
-	0,
-	NULL
+	name:		"debug",
+	flags:		CON_PRINTBUFFER,
+	index:		-1,
 };
 
 /*
diff --git a/arch/m68k/mm/init.c b/arch/m68k/mm/init.c
index 612d51eda..dbb3d81e2 100644
--- a/arch/m68k/mm/init.c
+++ b/arch/m68k/mm/init.c
@@ -32,7 +32,7 @@
 #include <asm/atari_stram.h>
 #endif
 
-static unsigned long totalram_pages = 0;
+static unsigned long totalram_pages;
 
 #ifdef CONFIG_SUN3
 void mmu_emu_reserve_pages(unsigned long max_page);
diff --git a/arch/m68k/q40/config.c b/arch/m68k/q40/config.c
index df0a57762..2496aa9ba 100644
--- a/arch/m68k/q40/config.c
+++ b/arch/m68k/q40/config.c
@@ -74,17 +74,10 @@ static unsigned char bin2bcd (unsigned char b);
 
 static int q40_wait_key(struct console *co){return 0;}
 static struct console q40_console_driver = {
-	"debug",
-	NULL,			/* write */
-	NULL,			/* read */
-	NULL,			/* device */
-	q40_wait_key,		/* wait_key */
-	NULL,			/* unblank */
-	NULL,			/* setup */
-	CON_PRINTBUFFER,
-	-1,
-	0,
-	NULL
+	name:		"debug",
+	wait_key:	q40_wait_key,
+	flags:		CON_PRINTBUFFER,
+	index:		-1,
 };