Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b340a207 authored by Jeff Kirsher's avatar Jeff Kirsher Committed by David S. Miller
Browse files

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: default avatarSascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 09df57ca

drivers/net/ethernet/apple/Kconfig

+1 −21
Original line number Diff line number Diff line
@@ -5,8 +5,7 @@ 
config NET_VENDOR_APPLE

	bool "Apple devices"

	default y

	depends on (PPC_PMAC && PPC32) || MAC || ISA || EISA || MACH_IXDP2351 \

		   || ARCH_IXDP2X01 || MACH_MX31ADS || MACH_QQ2440

	depends on (PPC_PMAC && PPC32) || MAC

	---help---

	  If you have a network (Ethernet) card belonging to this class, say Y

	  and read the Ethernet-HOWTO, available from
@@ -75,23 +74,4 @@ config MACMACE 
	  say Y and read the Ethernet-HOWTO, available from

	  <http://www.tldp.org/docs.html#howto>.



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



endif # NET_VENDOR_APPLE

drivers/net/ethernet/apple/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -5,5 +5,4 @@ 
obj-$(CONFIG_MACE) += mace.o

obj-$(CONFIG_BMAC) += bmac.o

obj-$(CONFIG_MAC89x0) += mac89x0.o

obj-$(CONFIG_CS89x0) += cs89x0.o

obj-$(CONFIG_MACMACE) += macmace.o

drivers/net/ethernet/cirrus/Kconfig

+21 −1
Original line number Diff line number Diff line
@@ -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

drivers/net/ethernet/cirrus/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -2,4 +2,5 @@ 
# Makefile for the Cirrus network device drivers.

#



obj-$(CONFIG_CS89x0) += cs89x0.o

obj-$(CONFIG_EP93XX_ETH) += ep93xx_eth.o