From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jeff Kirsher Subject: [RFC 56/72] macb: Move the Atmel driver Date: Sat, 25 Jun 2011 06:59:07 -0700 Message-ID: <1309010363-22750-57-git-send-email-jeffrey.t.kirsher@intel.com> References: <1309010363-22750-1-git-send-email-jeffrey.t.kirsher@intel.com> Cc: Jeff Kirsher , netdev@vger.kernel.org, Nicolas Ferre To: davem@davemloft.net Return-path: Received: from mga03.intel.com ([143.182.124.21]:41778 "EHLO mga03.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751711Ab1FYOA2 (ORCPT ); Sat, 25 Jun 2011 10:00:28 -0400 In-Reply-To: <1309010363-22750-1-git-send-email-jeffrey.t.kirsher@intel.com> Sender: netdev-owner@vger.kernel.org List-ID: Move the Atmel driver into drivers/net/ethernet/atmel/ and make the necessary Kconfig and Makefile changes. CC: Nicolas Ferre Signed-off-by: Jeff Kirsher --- MAINTAINERS | 2 +- drivers/net/Kconfig | 14 ------------- drivers/net/Makefile | 1 - drivers/net/ethernet/Kconfig | 1 + drivers/net/ethernet/Makefile | 1 + drivers/net/ethernet/atmel/Kconfig | 32 +++++++++++++++++++++++++++++++ drivers/net/ethernet/atmel/Makefile | 5 ++++ drivers/net/{ => ethernet/atmel}/macb.c | 0 drivers/net/{ => ethernet/atmel}/macb.h | 0 9 files changed, 40 insertions(+), 16 deletions(-) create mode 100644 drivers/net/ethernet/atmel/Kconfig create mode 100644 drivers/net/ethernet/atmel/Makefile rename drivers/net/{ => ethernet/atmel}/macb.c (100%) rename drivers/net/{ => ethernet/atmel}/macb.h (100%) diff --git a/MAINTAINERS b/MAINTAINERS index 506d4d0..9ddb715 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1303,7 +1303,7 @@ F: include/video/atmel_lcdc.h ATMEL MACB ETHERNET DRIVER M: Nicolas Ferre S: Supported -F: drivers/net/macb.* +F: drivers/net/ethernet/atmel/ ATMEL SPI DRIVER M: Nicolas Ferre diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index 9709106..7063b9c 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig @@ -2,9 +2,6 @@ # Network device configuration # -config HAVE_NET_MACB - bool - menuconfig NETDEVICES default y if UML depends on NET @@ -224,17 +221,6 @@ menuconfig NET_ETHERNET if NET_ETHERNET -config MACB - tristate "Atmel MACB support" - depends on HAVE_NET_MACB - select PHYLIB - help - The Atmel MACB ethernet interface is found on many AT32 and AT91 - parts. Say Y to include support for the MACB chip. - - To compile this driver as a module, choose M here: the module - will be called macb. - config SH_ETH tristate "Renesas SuperH Ethernet support" depends on SUPERH && \ diff --git a/drivers/net/Makefile b/drivers/net/Makefile index 5c189ab..a2a1e0a 100644 --- a/drivers/net/Makefile +++ b/drivers/net/Makefile @@ -68,7 +68,6 @@ obj-$(CONFIG_ETHOC) += ethoc.o obj-$(CONFIG_GRETH) += greth.o obj-$(CONFIG_DNET) += dnet.o -obj-$(CONFIG_MACB) += macb.o obj-$(CONFIG_DEV_APPLETALK) += appletalk/ obj-$(CONFIG_ETHERNET) += ethernet/ diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig index fede911..e7c5f0b 100644 --- a/drivers/net/ethernet/Kconfig +++ b/drivers/net/ethernet/Kconfig @@ -39,6 +39,7 @@ config ARIADNE source "drivers/net/ethernet/arm/Kconfig" source "drivers/net/ethernet/atheros/Kconfig" +source "drivers/net/ethernet/atmel/Kconfig" source "drivers/net/ethernet/blackfin/Kconfig" source "drivers/net/ethernet/broadcom/Kconfig" source "drivers/net/ethernet/brocade/Kconfig" diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile index b8cc6ef..6c69e98 100644 --- a/drivers/net/ethernet/Makefile +++ b/drivers/net/ethernet/Makefile @@ -10,6 +10,7 @@ obj-$(CONFIG_NET_VENDOR_APPLE) += apple/ obj-$(CONFIG_ARIADNE) += ariadne.o obj-$(CONFIG_NET_ARM) += arm/ obj-$(CONFIG_NET_VENDOR_ATHEROS) += atheros/ +obj-$(CONFIG_NET_ATMEL) += atmel/ obj-$(CONFIG_NET_BFIN) += blackfin/ obj-$(CONFIG_NET_VENDOR_BROADCOM) += broadcom/ obj-$(CONFIG_NET_VENDOR_BROCADE) += brocade/ diff --git a/drivers/net/ethernet/atmel/Kconfig b/drivers/net/ethernet/atmel/Kconfig new file mode 100644 index 0000000..a8c11ea --- /dev/null +++ b/drivers/net/ethernet/atmel/Kconfig @@ -0,0 +1,32 @@ +# +# Atmel device configuration +# + +config HAVE_NET_MACB + bool + +config NET_ATMEL + bool "Atmel devices" + depends on HAVE_NET_MACB + ---help--- + If you have a network (Ethernet) card belonging to this class, say Y. + Make sure you know the name of your card. Read the Ethernet-HOWTO, + available from . + + If unsure, say Y. + + Note that the answer to this question doesn't directly affect the + kernel: saying N will just cause the configurator to skip all + the remaining Atmel network card questions. If you say Y, you will be + asked for your specific card in the following questions. + +config MACB + tristate "Atmel MACB support" + depends on NET_ATMEL && HAVE_NET_MACB + select PHYLIB + ---help--- + The Atmel MACB ethernet interface is found on many AT32 and AT91 + parts. Say Y to include support for the MACB chip. + + To compile this driver as a module, choose M here: the module + will be called macb. diff --git a/drivers/net/ethernet/atmel/Makefile b/drivers/net/ethernet/atmel/Makefile new file mode 100644 index 0000000..91f79b1 --- /dev/null +++ b/drivers/net/ethernet/atmel/Makefile @@ -0,0 +1,5 @@ +# +# Makefile for the Atmel network device drivers. +# + +obj-$(CONFIG_MACB) += macb.o diff --git a/drivers/net/macb.c b/drivers/net/ethernet/atmel/macb.c similarity index 100% rename from drivers/net/macb.c rename to drivers/net/ethernet/atmel/macb.c diff --git a/drivers/net/macb.h b/drivers/net/ethernet/atmel/macb.h similarity index 100% rename from drivers/net/macb.h rename to drivers/net/ethernet/atmel/macb.h -- 1.7.5.4