From 1ae0af78b4bf51c11b9f090983412bf42f6e3076 Mon Sep 17 00:00:00 2001 From: Geert Uytterhoeven Date: Sat, 29 Oct 2011 08:09:01 +0000 Subject: [PATCH] --- yaml --- r: 273515 b: refs/heads/master c: 0a3360e1e18fc6bbe10bebe416db42de5fa02dbd h: refs/heads/master i: 273513: b19de624149654f4fb8493bb076af676e6517531 273511: d6e06364e3d492dc8d3c4bd286027a048be77721 v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/apple/Kconfig | 12 ------------ trunk/drivers/net/ethernet/apple/Makefile | 1 - trunk/drivers/net/ethernet/cirrus/Kconfig | 14 +++++++++++++- trunk/drivers/net/ethernet/cirrus/Makefile | 1 + .../net/ethernet/{apple => cirrus}/mac89x0.c | 0 6 files changed, 15 insertions(+), 15 deletions(-) rename trunk/drivers/net/ethernet/{apple => cirrus}/mac89x0.c (100%) diff --git a/[refs] b/[refs] index 3e9a8f5f9c35..9601339f5f83 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1b6b7172d0ee37528762bddb83acb56cb38ffac2 +refs/heads/master: 0a3360e1e18fc6bbe10bebe416db42de5fa02dbd diff --git a/trunk/drivers/net/ethernet/apple/Kconfig b/trunk/drivers/net/ethernet/apple/Kconfig index a759d5483ab9..1375e2dc9468 100644 --- a/trunk/drivers/net/ethernet/apple/Kconfig +++ b/trunk/drivers/net/ethernet/apple/Kconfig @@ -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 - . - - 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 diff --git a/trunk/drivers/net/ethernet/apple/Makefile b/trunk/drivers/net/ethernet/apple/Makefile index 0d3a5919c95b..86eaa17af0f4 100644 --- a/trunk/drivers/net/ethernet/apple/Makefile +++ b/trunk/drivers/net/ethernet/apple/Makefile @@ -4,5 +4,4 @@ obj-$(CONFIG_MACE) += mace.o obj-$(CONFIG_BMAC) += bmac.o -obj-$(CONFIG_MAC89x0) += mac89x0.o obj-$(CONFIG_MACMACE) += macmace.o diff --git a/trunk/drivers/net/ethernet/cirrus/Kconfig b/trunk/drivers/net/ethernet/cirrus/Kconfig index 6cbb81ccc02e..1f8648f099c7 100644 --- a/trunk/drivers/net/ethernet/cirrus/Kconfig +++ b/trunk/drivers/net/ethernet/cirrus/Kconfig @@ -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 + . + + To compile this driver as a module, choose M here. This module will + be called mac89x0. + endif # NET_VENDOR_CIRRUS diff --git a/trunk/drivers/net/ethernet/cirrus/Makefile b/trunk/drivers/net/ethernet/cirrus/Makefile index 14bd77e0cb57..ca245e2b5d98 100644 --- a/trunk/drivers/net/ethernet/cirrus/Makefile +++ b/trunk/drivers/net/ethernet/cirrus/Makefile @@ -4,3 +4,4 @@ obj-$(CONFIG_CS89x0) += cs89x0.o obj-$(CONFIG_EP93XX_ETH) += ep93xx_eth.o +obj-$(CONFIG_MAC89x0) += mac89x0.o diff --git a/trunk/drivers/net/ethernet/apple/mac89x0.c b/trunk/drivers/net/ethernet/cirrus/mac89x0.c similarity index 100% rename from trunk/drivers/net/ethernet/apple/mac89x0.c rename to trunk/drivers/net/ethernet/cirrus/mac89x0.c