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

Commit 0a3360e1 authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by David S. Miller
Browse files

net/ethernet: Move mac89x0.c from apple to cirrus 



Macintosh CS89x0 based ethernet cards use a Crystal Semiconductor (Now
Cirrus Logic) CS89x0 chip, so the mac89x0 driver should be in
drivers/net/ethernet/cirrus instead of drivers/net/ethernet/apple.

This also fixes a build problem, as the driver needs a header file from the
cirrus directory:

drivers/net/ethernet/apple/mac89x0.c:107:20: error: cs89x0.h: No such file or directory

Signed-off-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 1b6b7172

drivers/net/ethernet/apple/Kconfig

+0 −12
Original line number Diff line number Diff line
@@ -52,18 +52,6 @@ config BMAC 
	  To compile this driver as a module, choose M here: the module

	  will be called bmac.



config MAC89x0

	tristate "Macintosh CS89x0 based ethernet cards"

	depends on MAC

	---help---

	  Support for CS89x0 chipset based Ethernet cards.  If you have a

	  Nubus or LC-PDS network (Ethernet) card of this type, say Y and

	  read the Ethernet-HOWTO, available from

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



	  To compile this driver as a module, choose M here. This module will

	  be called mac89x0.



config MACMACE

	bool "Macintosh (AV) onboard MACE ethernet"

	depends on MAC

drivers/net/ethernet/apple/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -4,5 +4,4 @@ 


obj-$(CONFIG_MACE) += mace.o

obj-$(CONFIG_BMAC) += bmac.o

obj-$(CONFIG_MAC89x0) += mac89x0.o

obj-$(CONFIG_MACMACE) += macmace.o

drivers/net/ethernet/cirrus/Kconfig

+13 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ config NET_VENDOR_CIRRUS 
	bool "Cirrus devices"

	default y

	depends on ISA || EISA || MACH_IXDP2351 || ARCH_IXDP2X01 \

		|| MACH_MX31ADS || MACH_QQ2440 || (ARM && ARCH_EP93XX)

		|| MACH_MX31ADS || MACH_QQ2440 || (ARM && ARCH_EP93XX) || MAC

	---help---

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

	  and read the Ethernet-HOWTO, available from
@@ -47,4 +47,16 @@ config EP93XX_ETH 
	  This is a driver for the ethernet hardware included in EP93xx CPUs.

	  Say Y if you are building a kernel for EP93xx based devices.



config MAC89x0

	tristate "Macintosh CS89x0 based ethernet cards"

	depends on MAC

	---help---

	  Support for CS89x0 chipset based Ethernet cards.  If you have a

	  Nubus or LC-PDS network (Ethernet) card of this type, say Y and

	  read the Ethernet-HOWTO, available from

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



	  To compile this driver as a module, choose M here. This module will

	  be called mac89x0.



endif # NET_VENDOR_CIRRUS

drivers/net/ethernet/cirrus/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -4,3 +4,4 @@ 


obj-$(CONFIG_CS89x0) += cs89x0.o

obj-$(CONFIG_EP93XX_ETH) += ep93xx_eth.o

obj-$(CONFIG_MAC89x0) += mac89x0.o