diff options
| author | Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2011-10-07 22:07:44 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-10-18 23:41:43 -0400 |
| commit | b340a207c5d81a0a33899e8ab3236a04dd8b48c3 (patch) | |
| tree | 8f9662ca81cd9332c3f6da12733a904e9434af17 /drivers/net/ethernet/cirrus/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/cirrus/Kconfig')
| -rw-r--r-- | drivers/net/ethernet/cirrus/Kconfig | 22 |
1 files changed, 21 insertions, 1 deletions
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 @@ config NET_VENDOR_CIRRUS bool "Cirrus devices" default y - depends on ARM && ARCH_EP93XX + depends on ISA || EISA || MACH_IXDP2351 || ARCH_IXDP2X01 \ + || MACH_MX31ADS || MACH_QQ2440 || (ARM && ARCH_EP93XX) ---help--- If you have a network (Ethernet) card belonging to this class, say Y and read the Ethernet-HOWTO, available from @@ -18,6 +19,25 @@ config NET_VENDOR_CIRRUS if NET_VENDOR_CIRRUS +config CS89x0 + tristate "CS89x0 support" + depends on (ISA || EISA || MACH_IXDP2351 \ + || ARCH_IXDP2X01 || MACH_MX31ADS || MACH_QQ2440) + ---help--- + Support for CS89x0 chipset based Ethernet cards. If you have a + network (Ethernet) card of this type, say Y and read the + Ethernet-HOWTO, available from + <http://www.tldp.org/docs.html#howto> as well as + <file:Documentation/networking/cs89x0.txt>. + + To compile this driver as a module, choose M here. The module + will be called cs89x0. + +config CS89x0_NONISA_IRQ + def_bool y + depends on CS89x0 != n + depends on MACH_IXDP2351 || ARCH_IXDP2X01 || MACH_MX31ADS || MACH_QQ2440 + config EP93XX_ETH tristate "EP93xx Ethernet support" depends on ARM && ARCH_EP93XX |