[ARM] Relocate ARM SCSI and Net drivers

Move Acorn and ARM SCSI and net drivers to drivers/{net,scsi}/arm.
This also allows us to find a reasonable home for other ARM specific
net drivers.

drivers/net/Kconfig

@@ -221,14 +221,7 @@ config MII
 	  or internal device.  It is safe to say Y or M here even if your
 	  ethernet card lack MII.
 
-config ARM_AM79C961A
-	bool "ARM EBSA110 AM79C961A support"
-	depends on NET_ETHERNET && ARM && ARCH_EBSA110
-	help
-	  If you wish to compile a kernel for the EBSA-110, then you should
-	  always answer Y to this.
-
-source "drivers/acorn/net/Kconfig"
+source "drivers/net/arm/Kconfig"
 
 config MACE
 	tristate "MACE (Power Mac ethernet) support"

drivers/net/Makefile

@@ -77,7 +77,6 @@ obj-$(CONFIG_HP100) += hp100.o
 obj-$(CONFIG_SMC9194) += smc9194.o
 obj-$(CONFIG_FEC) += fec.o
 obj-$(CONFIG_68360_ENET) += 68360enet.o
-obj-$(CONFIG_ARM_AM79C961A) += am79c961a.o
 obj-$(CONFIG_ARM_ETHERH) += 8390.o
 obj-$(CONFIG_WD80x3) += wd.o 8390.o
 obj-$(CONFIG_EL2) += 3c503.o 8390.o
@@ -179,7 +178,7 @@ obj-$(CONFIG_AMD8111_ETH) += amd8111e.o
 # non-drivers/net drivers who want mii lib
 obj-$(CONFIG_PCMCIA_SMC91C92) += mii.o
 
-obj-$(CONFIG_ARCH_ACORN) += ../acorn/net/
+obj-$(CONFIG_ARM) += arm/
 obj-$(CONFIG_NET_FC) += fc/
 obj-$(CONFIG_DEV_APPLETALK) += appletalk/
 obj-$(CONFIG_TR) += tokenring/

drivers/acorn/net/Kconfig → drivers/net/arm/Kconfig

@@ -2,6 +2,13 @@
 # Acorn Network device configuration
 #  These are for Acorn's Expansion card network interfaces
 #
+config ARM_AM79C961A
+	bool "ARM EBSA110 AM79C961A support"
+	depends on NET_ETHERNET && ARM && ARCH_EBSA110
+	help
+	  If you wish to compile a kernel for the EBSA-110, then you should
+	  always answer Y to this.
+
 config ARM_ETHER1
 	tristate "Acorn Ether1 support"
 	depends on NET_ETHERNET && ARM && ARCH_ACORN
@@ -23,3 +30,16 @@ config ARM_ETHERH
 	  If you have an Acorn system with one of these network cards, you
 	  should say Y to this option if you wish to use it with Linux.
 
+config ARM_ETHER00
+	tristate "Altera Ether00 support"
+	depends on NET_ETHERNET && ARM && ARCH_CAMELOT
+	help
+	  This is the driver for Altera's ether00 ethernet mac IP core. Say
+	  Y here if you want to build support for this into the kernel. It
+	  is also available as a module (say M here) that can be inserted/
+	  removed from the kernel at the same time as the PLD is configured.
+	  If this driver is running on an epxa10 development board then it
+	  will generate a suitable hw address based on the board serial
+	  number (MTD support is required for this). Otherwise you will
+	  need to set a suitable hw address using ifconfig.
+

drivers/acorn/net/Makefile → drivers/net/arm/Makefile

-# File: drivers/acorn/net/Makefile
+# File: drivers/net/arm/Makefile
 #
-# Makefile for the Acorn ethercard network device drivers
+# Makefile for the ARM network device drivers
 #
 
+obj-$(CONFIG_ARM_AM79C961A)	+= am79c961a.o
+obj-$(CONFIG_ARM_ETHER00)	+= ether00.o
 obj-$(CONFIG_ARM_ETHERH)	+= etherh.o
 obj-$(CONFIG_ARM_ETHER3)	+= ether3.o
 obj-$(CONFIG_ARM_ETHER1)	+= ether1.o

drivers/acorn/net/etherh.c → drivers/net/arm/etherh.c

@@ -51,7 +51,7 @@
 #include <asm/io.h>
 #include <asm/irq.h>
 
-#include "../../net/8390.h"
+#include "../8390.h"
 
 #define NET_DEBUG  0
 #define DEBUG_INIT 2

drivers/scsi/Kconfig

@@ -1602,7 +1602,7 @@ config SCSI_MAC53C94
 	  whenever you want). If you want to compile it as a module, say M
 	  here and read <file:Documentation/modules.txt>.
 
-source "drivers/acorn/scsi/Kconfig"
+source "drivers/scsi/arm/Kconfig"
 
 config JAZZ_ESP
 	bool "MIPS JAZZ FAS216 SCSI support"

drivers/scsi/Makefile

@@ -114,7 +114,7 @@ obj-$(CONFIG_SCSI_CPQFCTS)	+= cpqfc.o
 obj-$(CONFIG_SCSI_LASI700)	+= lasi700.o 53c700.o
 obj-$(CONFIG_SCSI_NSP32)	+= nsp32.o
 
-obj-$(CONFIG_ARCH_ACORN)	+= ../acorn/scsi/
+obj-$(CONFIG_ARM)		+= arm/
 
 obj-$(CONFIG_CHR_DEV_ST)	+= st.o
 obj-$(CONFIG_CHR_DEV_OSST)	+= osst.o

drivers/acorn/scsi/Makefile → drivers/scsi/arm/Makefile

 #
-# Makefile for drivers/acorn/scsi
+# Makefile for drivers/scsi/arm
 #
 
 acornscsi_mod-objs	:= acornscsi.o acornscsi-io.o

drivers/acorn/scsi/acornscsi.c → drivers/scsi/arm/acornscsi.c

@@ -149,8 +149,8 @@
 #include <asm/irq.h>
 #include <asm/ecard.h>
 
-#include "../../scsi/scsi.h"
-#include "../../scsi/hosts.h"
+#include "../scsi.h"
+#include "../hosts.h"
 #include "acornscsi.h"
 #include "msgqueue.h"
 #include "scsi.h"

drivers/acorn/scsi/arxescsi.c → drivers/scsi/arm/arxescsi.c

@@ -36,8 +36,8 @@
 #include <asm/irq.h>
 #include <asm/ecard.h>
 
-#include "../../scsi/scsi.h"
-#include "../../scsi/hosts.h"
+#include "../scsi.h"
+#include "../hosts.h"
 #include "fas216.h"
 
 struct arxescsi_info {

drivers/acorn/scsi/cumana_1.c → drivers/scsi/arm/cumana_1.c

@@ -16,8 +16,8 @@
 #include <asm/irq.h>
 #include <asm/system.h>
 
-#include "../../scsi/scsi.h"
-#include "../../scsi/hosts.h"
+#include "../scsi.h"
+#include "../hosts.h"
 
 #include <scsi/scsicam.h>
 
@@ -41,7 +41,7 @@ int NCR5380_proc_info(char *buffer, char **start, off_t offset,
 #define BOARD_NORMAL	0
 #define BOARD_NCR53C400	1
 
-#include "../../scsi/NCR5380.h"
+#include "../NCR5380.h"
 
 void cumanascsi_setup(char *str, int *ints)
 {
@@ -239,7 +239,7 @@ static void cumanascsi_write(struct Scsi_Host *instance, int reg, int value)
 
 #undef CTRL
 
-#include "../../scsi/NCR5380.c"
+#include "../NCR5380.c"
 
 static Scsi_Host_Template cumanascsi_template = {
 	.module			= THIS_MODULE,

drivers/acorn/scsi/cumana_2.c → drivers/scsi/arm/cumana_2.c

@@ -34,8 +34,8 @@
 #include <asm/irq.h>
 #include <asm/pgtable.h>
 
-#include "../../scsi/scsi.h"
-#include "../../scsi/hosts.h"
+#include "../scsi.h"
+#include "../hosts.h"
 #include "fas216.h"
 #include "scsi.h"
 

drivers/acorn/scsi/ecoscsi.c → drivers/scsi/arm/ecoscsi.c

@@ -52,8 +52,8 @@
 #include <asm/io.h>
 #include <asm/system.h>
 
-#include "../../scsi/scsi.h"
-#include "../../scsi/hosts.h"
+#include "../scsi.h"
+#include "../hosts.h"
 
 #define NCR5380_implementation_fields	int port, ctrl
 #define NCR5380_local_declare()		struct Scsi_Host *_instance
@@ -66,7 +66,7 @@
 #define NCR5380_queue_command		ecoscsi_queue_command
 #define NCR5380_proc_info		ecoscsi_proc_info
 
-#include "../../scsi/NCR5380.h"
+#include "../NCR5380.h"
 
 #define ECOSCSI_PUBLIC_RELEASE 1
 
@@ -239,7 +239,7 @@ int NCR5380_proc_info(char *buffer, char **start, off_t offset,
 #define BOARD_NORMAL	0
 #define BOARD_NCR53C400	1
 
-#include "../../scsi/NCR5380.c"
+#include "../NCR5380.c"
 
 static Scsi_Host_Template ecoscsi_template =  {
 	.module		= THIS_MODULE,

drivers/acorn/scsi/eesox.c → drivers/scsi/arm/eesox.c

@@ -40,8 +40,8 @@
 #include <asm/ecard.h>
 #include <asm/pgtable.h>
 
-#include "../../scsi/scsi.h"
-#include "../../scsi/hosts.h"
+#include "../scsi.h"
+#include "../hosts.h"
 #include "fas216.h"
 #include "scsi.h"
 

drivers/acorn/scsi/fas216.c → drivers/scsi/arm/fas216.c

@@ -51,8 +51,8 @@
 #include <asm/irq.h>
 #include <asm/ecard.h>
 
-#include "../../scsi/scsi.h"
-#include "../../scsi/hosts.h"
+#include "../scsi.h"
+#include "../hosts.h"
 #include "fas216.h"
 #include "scsi.h"
 

drivers/acorn/scsi/oak.c → drivers/scsi/arm/oak.c

@@ -16,8 +16,8 @@
 #include <asm/io.h>
 #include <asm/system.h>
 
-#include "../../scsi/scsi.h"
-#include "../../scsi/hosts.h"
+#include "../scsi.h"
+#include "../hosts.h"
 
 #define AUTOSENSE
 /*#define PSEUDO_DMA*/
@@ -40,7 +40,7 @@ int NCR5380_proc_info(char *buffer, char **start, off_t offset,
 #define BOARD_NORMAL	0
 #define BOARD_NCR53C400	1
 
-#include "../../scsi/NCR5380.h"
+#include "../NCR5380.h"
 
 #undef START_DMA_INITIATOR_RECEIVE_REG
 #define START_DMA_INITIATOR_RECEIVE_REG (7 + 128)
@@ -112,7 +112,7 @@ printk("reading %p len %d\n", addr, len);
 
 #undef STAT
 
-#include "../../scsi/NCR5380.c"
+#include "../NCR5380.c"
 
 static Scsi_Host_Template oakscsi_template = {
 	.module			= THIS_MODULE,

drivers/acorn/scsi/powertec.c → drivers/scsi/arm/powertec.c

@@ -25,8 +25,8 @@
 #include <asm/irq.h>
 #include <asm/pgtable.h>
 
-#include "../../scsi/scsi.h"
-#include "../../scsi/hosts.h"
+#include "../scsi.h"
+#include "../hosts.h"
 #include "fas216.h"
 #include "scsi.h"
 

drivers/acorn/scsi/queue.c → drivers/scsi/arm/queue.c

@@ -23,7 +23,7 @@
 #include <linux/list.h>
 #include <linux/init.h>
 
-#include "../../scsi/scsi.h"
+#include "../scsi.h"
 
 #define DEBUG