diff options
author | Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2011-10-07 18:07:44 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-10-18 23:41:43 -0400 |
commit | b340a207c5d81a0a33899e8ab3236a04dd8b48c3 (patch) | |
tree | 8f9662ca81cd9332c3f6da12733a904e9434af17 /drivers/net/ethernet/apple/Kconfig | |
parent | 09df57ca604512b29b6096afb381c839ccbd2912 (diff) |
cs89x0: Move the driver into the Cirrus dir
The cs89x0 driver was initial placed in the apple/ when it
should have been placed in the cirrus/. This resolves the
issue by moving the dirver and fixing up the respective
Kconfig(s) and Makefile(s).
Thanks to Sascha for reporting the issue.
-v2 Fix a config error that was introduced with v1 by removing
the dependency on MACE for NET_VENDOR_APPLE.
CC: Russell Nelson <nelson@crynwr.com>
CC: Andrew Morton <akpm@linux-foundation.org>
Reported-by: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/apple/Kconfig')
-rw-r--r-- | drivers/net/ethernet/apple/Kconfig | 22 |
1 files changed, 1 insertions, 21 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 |