Merge with Linux 2.3.23. The new bootmem stuff has broken various

platforms.  At this time I've only verified that IP22 support compiles
and IP27 actually works.

7 files changed, 25 insertions, 58 deletions

diff --git a/drivers/acorn/Makefile b/drivers/acorn/Makefile
new file mode 100644
index 000000000..53b3b975a
--- /dev/null
+++ b/drivers/acorn/Makefile
@@ -0,0 +1,12 @@
+#
+# Makefile for the Acorn-specific Linux kernel device drivers.
+#
+# Note! Dependencies are done automagically by 'make dep', which also
+# removes any old dependencies. DON'T put your own dependencies here
+# unless it's something special (not a .c file).
+
+SUB_DIRS     := block char net scsi
+MOD_SUB_DIRS := $(SUB_DIRS)
+ALL_SUB_DIRS := $(SUB_DIRS)
+
+include $(TOPDIR)/Rules.make
diff --git a/drivers/acorn/README b/drivers/acorn/README
index 283bfa5be..d399c09ca 100644
--- a/drivers/acorn/README
+++ b/drivers/acorn/README
@@ -1,3 +1 @@
 Drivers for the ACORN "podule" ARM specific bus.
-
-
diff --git a/drivers/acorn/block/Makefile b/drivers/acorn/block/Makefile
index 4db3192b6..9f5953b39 100644
--- a/drivers/acorn/block/Makefile
+++ b/drivers/acorn/block/Makefile
@@ -32,17 +32,11 @@ endif
 
 include $(TOPDIR)/Rules.make
 
+.S.o:
+	$(CC) -D__ASSEMBLY__ $(AFLAGS) -traditional -c -o $*.o $<
+
 fd1772_mod.o: $(FLOPPY)
 	$(LD) -r -o $@ $(FLOPPY)
 
 mfmhd_mod.o: mfmhd.o mfm.o
 	$(LD) -r -o $@ mfmhd.o mfm.o
-
-%.o: %.S
-ifndef $(CONFIG_BINUTILS_NEW)
-	$(CC) $(CFLAGS) -D__ASSEMBLY__ -E $< | tr ';$$' '\n#' > ..tmp.s
-	$(CC) $(CFLAGS) -c -o $@ ..tmp.s
-	$(RM) ..tmp.s
-else
-	$(CC) $(CFLAGS) -D__ASSEMBLY__ -c -o $@ $<
-endif
diff --git a/drivers/acorn/char/keyb_arc.c b/drivers/acorn/char/keyb_arc.c
index 282f151f4..44395fd97 100644
--- a/drivers/acorn/char/keyb_arc.c
+++ b/drivers/acorn/char/keyb_arc.c
@@ -31,7 +31,7 @@
 #include <asm/ioc.h>
 #include <asm/hardware.h>
 
-#include "../../char/mouse.h"
+#include "../../char/busmouse.h"
 
 extern void kbd_reset_kdown(void);
 
@@ -47,7 +47,7 @@ static char kbd_txval[4];
 static unsigned char kbd_txhead, kbd_txtail;
 #define KBD_INCTXPTR(ptr) ((ptr) = ((ptr) + 1) & 3)
 static int kbd_id = -1;
-static struct wait_queue *kbd_waitq;
+static DECLARE_WAIT_QUEUE_HEAD(kbd_waitq);
 #ifdef CONFIG_KBDMOUSE
 static int mousedev;
 #endif
diff --git a/drivers/acorn/net/ether1.c b/drivers/acorn/net/ether1.c
index a719b4563..5c8b0e26d 100644
--- a/drivers/acorn/net/ether1.c
+++ b/drivers/acorn/net/ether1.c
@@ -255,7 +255,7 @@ ether1_readbuffer (struct net_device *dev, void *data, unsigned int start, unsig
 }
 
 static int __init
-ether1_ramtest (struct net_device *dev, unsigned char byte)
+ether1_ramtest(struct net_device *dev, unsigned char byte)
 {
 	unsigned char *buffer = kmalloc (BUFFER_SIZE, GFP_KERNEL);
 	int i, ret = BUFFER_SIZE;
@@ -309,7 +309,7 @@ ether1_reset (struct net_device *dev)
 }
 
 static int __init
-ether1_init_2 (struct net_device *dev)
+ether1_init_2(struct net_device *dev)
 {
 	int i;
 	dev->mem_start = 0;
@@ -613,7 +613,7 @@ ether1_init_for_open (struct net_device *dev)
 }
 
 static int __init
-ether1_probe1 (struct net_device *dev)
+ether1_probe1(struct net_device *dev)
 {
 	static unsigned int version_printed = 0;
 	struct ether1_priv *priv;
@@ -665,7 +665,7 @@ ether1_probe1 (struct net_device *dev)
 /* ------------------------------------------------------------------------- */
 
 static void __init
-ether1_addr (struct net_device *dev)
+ether1_addr(struct net_device *dev)
 {
 	int i;
     
@@ -674,7 +674,7 @@ ether1_addr (struct net_device *dev)
 }
 
 int __init
-ether1_probe (struct net_device *dev)
+ether1_probe(struct net_device *dev)
 {
 #ifndef MODULE
 	struct expansion_card *ec;
diff --git a/drivers/acorn/net/net-probe.c b/drivers/acorn/net/net-probe.c
deleted file mode 100644
index e4629dfd2..000000000
--- a/drivers/acorn/net/net-probe.c
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Acorn specific net device driver probe routine
- *
- * Copyright (C) 1998 Russell King
- */
-#include <linux/config.h>
-#include <linux/netdevice.h>
-#include <linux/errno.h>
-#include <linux/init.h>
-
-extern int ether1_probe (struct net_device *dev);
-extern int ether3_probe (struct net_device *dev);
-extern int etherh_probe (struct net_device *dev);
-
-int __init acorn_ethif_probe(struct net_device *dev)
-{
-	if (1
-#ifdef CONFIG_ARM_ETHERH
-        && etherh_probe (dev)
-#endif
-#ifdef CONFIG_ARM_ETHER3
-        && ether3_probe (dev)
-#endif
-#ifdef CONFIG_ARM_ETHER1
-        && ether1_probe (dev)
-#endif
-	&& 1) {
-		return 1;
-	}
-	return 0;
-}
diff --git a/drivers/acorn/scsi/Makefile b/drivers/acorn/scsi/Makefile
index 6efd22681..ee7152a44 100644
--- a/drivers/acorn/scsi/Makefile
+++ b/drivers/acorn/scsi/Makefile
@@ -108,14 +108,8 @@ endif
 
 include $(TOPDIR)/Rules.make
 
+.S.o:
+	$(CC) -D__ASSEMBLY__ $(AFLAGS) -traditional -c -o $*.o $<
+
 acornscsi_mod.o: acornscsi.o acornscsi-io.o
 	$(LD) $(LD_RFLAG) -r -o $@ acornscsi.o acornscsi-io.o
-
-%.o: %.S
-ifndef $(CONFIG_BINUTILS_NEW)
-	$(CC) $(CFLAGS) -D__ASSEMBLY__ -E $< | tr ';$$' '\n#' > ..tmp.$<.s
-	$(CC) $(CFLAGS:-pipe=) -c -o $@ ..tmp.$<.s
-	$(RM) ..tmp.$<.s
-else
-	$(CC) $(CFLAGS) -D__ASSEMBLY__ -c -o $@ $<
-endif