diff options
-rw-r--r-- | drivers/net/ethernet/apple/Kconfig | 22 | ||||
-rw-r--r-- | drivers/net/ethernet/apple/Makefile | 1 | ||||
-rw-r--r-- | drivers/net/ethernet/cirrus/Kconfig | 22 | ||||
-rw-r--r-- | drivers/net/ethernet/cirrus/Makefile | 1 | ||||
-rw-r--r-- | drivers/net/ethernet/cirrus/cs89x0.c (renamed from drivers/net/ethernet/apple/cs89x0.c) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/cirrus/cs89x0.h (renamed from drivers/net/ethernet/apple/cs89x0.h) | 0 |
6 files changed, 23 insertions, 23 deletions
diff --git a/drivers/net/ethernet/apple/Kconfig b/drivers/net/ethernet/apple/Kconfig index 59d5c2630acb..a759d5483ab9 100644 --- a/drivers/net/ethernet/apple/Kconfig +++ b/drivers/net/ethernet/apple/Kconfig | |||
@@ -5,8 +5,7 @@ | |||
5 | config NET_VENDOR_APPLE | 5 | config NET_VENDOR_APPLE |
6 | bool "Apple devices" | 6 | bool "Apple devices" |
7 | default y | 7 | default y |
8 | depends on (PPC_PMAC && PPC32) || MAC || ISA || EISA || MACH_IXDP2351 \ | 8 | depends on (PPC_PMAC && PPC32) || MAC |
9 | || ARCH_IXDP2X01 || MACH_MX31ADS || MACH_QQ2440 | ||
10 | ---help--- | 9 | ---help--- |
11 | If you have a network (Ethernet) card belonging to this class, say Y | 10 | If you have a network (Ethernet) card belonging to this class, say Y |
12 | and read the Ethernet-HOWTO, available from | 11 | and read the Ethernet-HOWTO, available from |
@@ -75,23 +74,4 @@ config MACMACE | |||
75 | say Y and read the Ethernet-HOWTO, available from | 74 | say Y and read the Ethernet-HOWTO, available from |
76 | <http://www.tldp.org/docs.html#howto>. | 75 | <http://www.tldp.org/docs.html#howto>. |
77 | 76 | ||
78 | config CS89x0 | ||
79 | tristate "CS89x0 support" | ||
80 | depends on (ISA || EISA || MACH_IXDP2351 \ | ||
81 | || ARCH_IXDP2X01 || MACH_MX31ADS || MACH_QQ2440) | ||
82 | ---help--- | ||
83 | Support for CS89x0 chipset based Ethernet cards. If you have a | ||
84 | network (Ethernet) card of this type, say Y and read the | ||
85 | Ethernet-HOWTO, available from | ||
86 | <http://www.tldp.org/docs.html#howto> as well as | ||
87 | <file:Documentation/networking/cs89x0.txt>. | ||
88 | |||
89 | To compile this driver as a module, choose M here. The module | ||
90 | will be called cs89x0. | ||
91 | |||
92 | config CS89x0_NONISA_IRQ | ||
93 | def_bool y | ||
94 | depends on CS89x0 != n | ||
95 | depends on MACH_IXDP2351 || ARCH_IXDP2X01 || MACH_MX31ADS || MACH_QQ2440 | ||
96 | |||
97 | endif # NET_VENDOR_APPLE | 77 | endif # NET_VENDOR_APPLE |
diff --git a/drivers/net/ethernet/apple/Makefile b/drivers/net/ethernet/apple/Makefile index 9d300864461f..0d3a5919c95b 100644 --- a/drivers/net/ethernet/apple/Makefile +++ b/drivers/net/ethernet/apple/Makefile | |||
@@ -5,5 +5,4 @@ | |||
5 | obj-$(CONFIG_MACE) += mace.o | 5 | obj-$(CONFIG_MACE) += mace.o |
6 | obj-$(CONFIG_BMAC) += bmac.o | 6 | obj-$(CONFIG_BMAC) += bmac.o |
7 | obj-$(CONFIG_MAC89x0) += mac89x0.o | 7 | obj-$(CONFIG_MAC89x0) += mac89x0.o |
8 | obj-$(CONFIG_CS89x0) += cs89x0.o | ||
9 | obj-$(CONFIG_MACMACE) += macmace.o | 8 | obj-$(CONFIG_MACMACE) += macmace.o |
diff --git a/drivers/net/ethernet/cirrus/Kconfig b/drivers/net/ethernet/cirrus/Kconfig index e9386ef524aa..6cbb81ccc02e 100644 --- a/drivers/net/ethernet/cirrus/Kconfig +++ b/drivers/net/ethernet/cirrus/Kconfig | |||
@@ -5,7 +5,8 @@ | |||
5 | config NET_VENDOR_CIRRUS | 5 | config NET_VENDOR_CIRRUS |
6 | bool "Cirrus devices" | 6 | bool "Cirrus devices" |
7 | default y | 7 | default y |
8 | depends on ARM && ARCH_EP93XX | 8 | depends on ISA || EISA || MACH_IXDP2351 || ARCH_IXDP2X01 \ |
9 | || MACH_MX31ADS || MACH_QQ2440 || (ARM && ARCH_EP93XX) | ||
9 | ---help--- | 10 | ---help--- |
10 | If you have a network (Ethernet) card belonging to this class, say Y | 11 | If you have a network (Ethernet) card belonging to this class, say Y |
11 | and read the Ethernet-HOWTO, available from | 12 | and read the Ethernet-HOWTO, available from |
@@ -18,6 +19,25 @@ config NET_VENDOR_CIRRUS | |||
18 | 19 | ||
19 | if NET_VENDOR_CIRRUS | 20 | if NET_VENDOR_CIRRUS |
20 | 21 | ||
22 | config CS89x0 | ||
23 | tristate "CS89x0 support" | ||
24 | depends on (ISA || EISA || MACH_IXDP2351 \ | ||
25 | || ARCH_IXDP2X01 || MACH_MX31ADS || MACH_QQ2440) | ||
26 | ---help--- | ||
27 | Support for CS89x0 chipset based Ethernet cards. If you have a | ||
28 | network (Ethernet) card of this type, say Y and read the | ||
29 | Ethernet-HOWTO, available from | ||
30 | <http://www.tldp.org/docs.html#howto> as well as | ||
31 | <file:Documentation/networking/cs89x0.txt>. | ||
32 | |||
33 | To compile this driver as a module, choose M here. The module | ||
34 | will be called cs89x0. | ||
35 | |||
36 | config CS89x0_NONISA_IRQ | ||
37 | def_bool y | ||
38 | depends on CS89x0 != n | ||
39 | depends on MACH_IXDP2351 || ARCH_IXDP2X01 || MACH_MX31ADS || MACH_QQ2440 | ||
40 | |||
21 | config EP93XX_ETH | 41 | config EP93XX_ETH |
22 | tristate "EP93xx Ethernet support" | 42 | tristate "EP93xx Ethernet support" |
23 | depends on ARM && ARCH_EP93XX | 43 | depends on ARM && ARCH_EP93XX |
diff --git a/drivers/net/ethernet/cirrus/Makefile b/drivers/net/ethernet/cirrus/Makefile index 9905ea20f9ff..14bd77e0cb57 100644 --- a/drivers/net/ethernet/cirrus/Makefile +++ b/drivers/net/ethernet/cirrus/Makefile | |||
@@ -2,4 +2,5 @@ | |||
2 | # Makefile for the Cirrus network device drivers. | 2 | # Makefile for the Cirrus network device drivers. |
3 | # | 3 | # |
4 | 4 | ||
5 | obj-$(CONFIG_CS89x0) += cs89x0.o | ||
5 | obj-$(CONFIG_EP93XX_ETH) += ep93xx_eth.o | 6 | obj-$(CONFIG_EP93XX_ETH) += ep93xx_eth.o |
diff --git a/drivers/net/ethernet/apple/cs89x0.c b/drivers/net/ethernet/cirrus/cs89x0.c index f328da24c8fa..f328da24c8fa 100644 --- a/drivers/net/ethernet/apple/cs89x0.c +++ b/drivers/net/ethernet/cirrus/cs89x0.c | |||
diff --git a/drivers/net/ethernet/apple/cs89x0.h b/drivers/net/ethernet/cirrus/cs89x0.h index 91423b70bb45..91423b70bb45 100644 --- a/drivers/net/ethernet/apple/cs89x0.h +++ b/drivers/net/ethernet/cirrus/cs89x0.h | |||