aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeff Kirsher <jeffrey.t.kirsher@intel.com>2011-07-15 06:18:21 -0400
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>2011-08-12 03:21:43 -0400
commit9e13fbf7af3cb044f365e8df9c0e9277715cfc7c (patch)
tree9093489bce7301d1d58bdfa7d7142ba9fb83e49a
parent8862bf1ed60de49550109b7023a0a33eb7db8b3c (diff)
seeq: Move the SEEQ drivers
Move the drivers that use SEEQ chipset into drivers/net/ethernet/seeq and make the necessary Kconfig and Makefile changes. CC: Russell King <linux@arm.linux.org.uk> CC: Hamish Coleman <hamish@zot.apana.org.au> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
-rw-r--r--MAINTAINERS3
-rw-r--r--drivers/net/Kconfig18
-rw-r--r--drivers/net/Makefile2
-rw-r--r--drivers/net/arm/Kconfig7
-rw-r--r--drivers/net/arm/Makefile1
-rw-r--r--drivers/net/ethernet/Kconfig1
-rw-r--r--drivers/net/ethernet/Makefile1
-rw-r--r--drivers/net/ethernet/seeq/Kconfig45
-rw-r--r--drivers/net/ethernet/seeq/Makefile7
-rw-r--r--drivers/net/ethernet/seeq/ether3.c (renamed from drivers/net/arm/ether3.c)0
-rw-r--r--drivers/net/ethernet/seeq/ether3.h (renamed from drivers/net/arm/ether3.h)0
-rw-r--r--drivers/net/ethernet/seeq/seeq8005.c (renamed from drivers/net/seeq8005.c)0
-rw-r--r--drivers/net/ethernet/seeq/seeq8005.h (renamed from drivers/net/seeq8005.h)0
-rw-r--r--drivers/net/ethernet/seeq/sgiseeq.c (renamed from drivers/net/sgiseeq.c)0
-rw-r--r--drivers/net/ethernet/seeq/sgiseeq.h (renamed from drivers/net/sgiseeq.h)0
15 files changed, 56 insertions, 29 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 1bd9fbd2175d..e986e3e1d2af 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1014,7 +1014,8 @@ F: arch/arm/include/asm/hardware/ioc.h
1014F: arch/arm/include/asm/hardware/iomd.h 1014F: arch/arm/include/asm/hardware/iomd.h
1015F: arch/arm/include/asm/hardware/memc.h 1015F: arch/arm/include/asm/hardware/memc.h
1016F: arch/arm/mach-rpc/ 1016F: arch/arm/mach-rpc/
1017F: drivers/net/arm/ether3* 1017F: drivers/net/ethernet/i825xx/ether1*
1018F: drivers/net/ethernet/seeq/ether3*
1018F: drivers/scsi/arm/ 1019F: drivers/scsi/arm/
1019 1020
1020ARM/SHARK MACHINE SUPPORT 1021ARM/SHARK MACHINE SUPPORT
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index aec74ad67cc0..696464cb0a93 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -489,17 +489,6 @@ config ETH16I
489 To compile this driver as a module, choose M here. The module 489 To compile this driver as a module, choose M here. The module
490 will be called eth16i. 490 will be called eth16i.
491 491
492config SEEQ8005
493 tristate "SEEQ8005 support (EXPERIMENTAL)"
494 depends on NET_ISA && EXPERIMENTAL
495 help
496 This is a driver for the SEEQ 8005 network (Ethernet) card. If this
497 is for you, read the Ethernet-HOWTO, available from
498 <http://www.tldp.org/docs.html#howto>.
499
500 To compile this driver as a module, choose M here. The module
501 will be called seeq8005.
502
503config NET_PCI 492config NET_PCI
504 bool "EISA, VLB, PCI and on board controllers" 493 bool "EISA, VLB, PCI and on board controllers"
505 depends on ISA || EISA || PCI 494 depends on ISA || EISA || PCI
@@ -690,13 +679,6 @@ config NET_POCKET
690 the questions about this class of network devices. If you say Y, you 679 the questions about this class of network devices. If you say Y, you
691 will be asked for your specific device in the following questions. 680 will be asked for your specific device in the following questions.
692 681
693config SGISEEQ
694 tristate "SGI Seeq ethernet controller support"
695 depends on SGI_HAS_SEEQ
696 help
697 Say Y here if you have an Seeq based Ethernet network card. This is
698 used in many Silicon Graphics machines.
699
700config FEC 682config FEC
701 bool "FEC ethernet controller (of ColdFire and some i.MX CPUs)" 683 bool "FEC ethernet controller (of ColdFire and some i.MX CPUs)"
702 depends on M523x || M527x || M5272 || M528x || M520x || M532x || \ 684 depends on M523x || M527x || M5272 || M528x || M520x || M532x || \
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index c98e1ad17c99..b1ead87b65c3 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -65,7 +65,6 @@ obj-$(CONFIG_SH_ETH) += sh_eth.o
65 65
66obj-$(CONFIG_HAMACHI) += hamachi.o 66obj-$(CONFIG_HAMACHI) += hamachi.o
67obj-$(CONFIG_NET) += Space.o loopback.o 67obj-$(CONFIG_NET) += Space.o loopback.o
68obj-$(CONFIG_SEEQ8005) += seeq8005.o
69obj-$(CONFIG_NET_SB1000) += sb1000.o 68obj-$(CONFIG_NET_SB1000) += sb1000.o
70obj-$(CONFIG_HP100) += hp100.o 69obj-$(CONFIG_HP100) += hp100.o
71obj-$(CONFIG_FEC) += fec.o 70obj-$(CONFIG_FEC) += fec.o
@@ -102,7 +101,6 @@ obj-$(CONFIG_IFB) += ifb.o
102obj-$(CONFIG_MACVLAN) += macvlan.o 101obj-$(CONFIG_MACVLAN) += macvlan.o
103obj-$(CONFIG_MACVTAP) += macvtap.o 102obj-$(CONFIG_MACVTAP) += macvtap.o
104obj-$(CONFIG_DEFXX) += defxx.o 103obj-$(CONFIG_DEFXX) += defxx.o
105obj-$(CONFIG_SGISEEQ) += sgiseeq.o
106obj-$(CONFIG_AT1700) += at1700.o 104obj-$(CONFIG_AT1700) += at1700.o
107obj-$(CONFIG_CPMAC) += cpmac.o 105obj-$(CONFIG_CPMAC) += cpmac.o
108 106
diff --git a/drivers/net/arm/Kconfig b/drivers/net/arm/Kconfig
index 4320e88b2ac2..b6f7302ccc64 100644
--- a/drivers/net/arm/Kconfig
+++ b/drivers/net/arm/Kconfig
@@ -3,13 +3,6 @@
3# These are for Acorn's Expansion card network interfaces 3# These are for Acorn's Expansion card network interfaces
4# 4#
5 5
6config ARM_ETHER3
7 tristate "Acorn/ANT Ether3 support"
8 depends on ARM && ARCH_ACORN
9 help
10 If you have an Acorn system with one of these network cards, you
11 should say Y to this option if you wish to use it with Linux.
12
13config ARM_AT91_ETHER 6config ARM_AT91_ETHER
14 tristate "AT91RM9200 Ethernet support" 7 tristate "AT91RM9200 Ethernet support"
15 depends on ARM && ARCH_AT91RM9200 8 depends on ARM && ARCH_AT91RM9200
diff --git a/drivers/net/arm/Makefile b/drivers/net/arm/Makefile
index 5a0f14196cb9..a2532e6d7df5 100644
--- a/drivers/net/arm/Makefile
+++ b/drivers/net/arm/Makefile
@@ -3,7 +3,6 @@
3# Makefile for the ARM network device drivers 3# Makefile for the ARM network device drivers
4# 4#
5 5
6obj-$(CONFIG_ARM_ETHER3) += ether3.o
7obj-$(CONFIG_ARM_AT91_ETHER) += at91_ether.o 6obj-$(CONFIG_ARM_AT91_ETHER) += at91_ether.o
8obj-$(CONFIG_ARM_KS8695_ETHER) += ks8695net.o 7obj-$(CONFIG_ARM_KS8695_ETHER) += ks8695net.o
9obj-$(CONFIG_EP93XX_ETH) += ep93xx_eth.o 8obj-$(CONFIG_EP93XX_ETH) += ep93xx_eth.o
diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig
index 7d25fa490a25..35ed4c21a454 100644
--- a/drivers/net/ethernet/Kconfig
+++ b/drivers/net/ethernet/Kconfig
@@ -36,6 +36,7 @@ source "drivers/net/ethernet/pasemi/Kconfig"
36source "drivers/net/ethernet/qlogic/Kconfig" 36source "drivers/net/ethernet/qlogic/Kconfig"
37source "drivers/net/ethernet/racal/Kconfig" 37source "drivers/net/ethernet/racal/Kconfig"
38source "drivers/net/ethernet/realtek/Kconfig" 38source "drivers/net/ethernet/realtek/Kconfig"
39source "drivers/net/ethernet/seeq/Kconfig"
39source "drivers/net/ethernet/sfc/Kconfig" 40source "drivers/net/ethernet/sfc/Kconfig"
40source "drivers/net/ethernet/sgi/Kconfig" 41source "drivers/net/ethernet/sgi/Kconfig"
41source "drivers/net/ethernet/smsc/Kconfig" 42source "drivers/net/ethernet/smsc/Kconfig"
diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile
index ec587159eec1..ea0999fd1494 100644
--- a/drivers/net/ethernet/Makefile
+++ b/drivers/net/ethernet/Makefile
@@ -27,6 +27,7 @@ obj-$(CONFIG_NET_VENDOR_PASEMI) += pasemi/
27obj-$(CONFIG_NET_VENDOR_QLOGIC) += qlogic/ 27obj-$(CONFIG_NET_VENDOR_QLOGIC) += qlogic/
28obj-$(CONFIG_NET_VENDOR_RACAL) += racal/ 28obj-$(CONFIG_NET_VENDOR_RACAL) += racal/
29obj-$(CONFIG_NET_VENDOR_REALTEK) += realtek/ 29obj-$(CONFIG_NET_VENDOR_REALTEK) += realtek/
30obj-$(CONFIG_NET_VENDOR_SEEQ) += seeq/
30obj-$(CONFIG_SFC) += sfc/ 31obj-$(CONFIG_SFC) += sfc/
31obj-$(CONFIG_NET_VENDOR_SGI) += sgi/ 32obj-$(CONFIG_NET_VENDOR_SGI) += sgi/
32obj-$(CONFIG_NET_VENDOR_SMSC) += smsc/ 33obj-$(CONFIG_NET_VENDOR_SMSC) += smsc/
diff --git a/drivers/net/ethernet/seeq/Kconfig b/drivers/net/ethernet/seeq/Kconfig
new file mode 100644
index 000000000000..02667915b34a
--- /dev/null
+++ b/drivers/net/ethernet/seeq/Kconfig
@@ -0,0 +1,45 @@
1#
2# SEEQ device configuration
3#
4
5config NET_VENDOR_SEEQ
6 bool "SEEQ devices"
7 depends on (ARM && ARCH_ACORN) || SGI_HAS_SEEQ || EXPERIMENTAL
8 ---help---
9 If you have a network (Ethernet) card belonging to this class, say Y
10 and read the Ethernet-HOWTO, available from
11 <http://www.tldp.org/docs.html#howto>.
12
13 Note that the answer to this question doesn't directly affect the
14 kernel: saying N will just cause the configurator to skip all
15 the questions about SEEQ devices. If you say Y, you will be asked for
16 your specific card in the following questions.
17
18if NET_VENDOR_SEEQ
19
20config ARM_ETHER3
21 tristate "Acorn/ANT Ether3 support"
22 depends on ARM && ARCH_ACORN
23 ---help---
24 If you have an Acorn system with one of these network cards, you
25 should say Y to this option if you wish to use it with Linux.
26
27config SEEQ8005
28 tristate "SEEQ8005 support (EXPERIMENTAL)"
29 depends on EXPERIMENTAL
30 ---help---
31 This is a driver for the SEEQ 8005 network (Ethernet) card. If this
32 is for you, read the Ethernet-HOWTO, available from
33 <http://www.tldp.org/docs.html#howto>.
34
35 To compile this driver as a module, choose M here. The module
36 will be called seeq8005.
37
38config SGISEEQ
39 tristate "SGI Seeq ethernet controller support"
40 depends on SGI_HAS_SEEQ
41 ---help---
42 Say Y here if you have an Seeq based Ethernet network card. This is
43 used in many Silicon Graphics machines.
44
45endif # NET_VENDOR_SEEQ
diff --git a/drivers/net/ethernet/seeq/Makefile b/drivers/net/ethernet/seeq/Makefile
new file mode 100644
index 000000000000..3e258a580c05
--- /dev/null
+++ b/drivers/net/ethernet/seeq/Makefile
@@ -0,0 +1,7 @@
1#
2# Makefile for the SEEQ network device drivers
3#
4
5obj-$(CONFIG_ARM_ETHER3) += ether3.o
6obj-$(CONFIG_SEEQ8005) += seeq8005.o
7obj-$(CONFIG_SGISEEQ) += sgiseeq.o
diff --git a/drivers/net/arm/ether3.c b/drivers/net/ethernet/seeq/ether3.c
index 44a8746f4014..44a8746f4014 100644
--- a/drivers/net/arm/ether3.c
+++ b/drivers/net/ethernet/seeq/ether3.c
diff --git a/drivers/net/arm/ether3.h b/drivers/net/ethernet/seeq/ether3.h
index 2db63b08bdf3..2db63b08bdf3 100644
--- a/drivers/net/arm/ether3.h
+++ b/drivers/net/ethernet/seeq/ether3.h
diff --git a/drivers/net/seeq8005.c b/drivers/net/ethernet/seeq/seeq8005.c
index d2fce98f557f..d2fce98f557f 100644
--- a/drivers/net/seeq8005.c
+++ b/drivers/net/ethernet/seeq/seeq8005.c
diff --git a/drivers/net/seeq8005.h b/drivers/net/ethernet/seeq/seeq8005.h
index 5dfb0098c6ca..5dfb0098c6ca 100644
--- a/drivers/net/seeq8005.h
+++ b/drivers/net/ethernet/seeq/seeq8005.h
diff --git a/drivers/net/sgiseeq.c b/drivers/net/ethernet/seeq/sgiseeq.c
index 52fb7ed9f365..52fb7ed9f365 100644
--- a/drivers/net/sgiseeq.c
+++ b/drivers/net/ethernet/seeq/sgiseeq.c
diff --git a/drivers/net/sgiseeq.h b/drivers/net/ethernet/seeq/sgiseeq.h
index 2211e2987a8d..2211e2987a8d 100644
--- a/drivers/net/sgiseeq.h
+++ b/drivers/net/ethernet/seeq/sgiseeq.h