diff options
| author | Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2011-07-24 23:51:26 +0200 |
|---|---|---|
| committer | Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2011-08-13 08:47:03 +0200 |
| commit | 1fe003fd4247edf0d1ccf32061b046b90492a954 (patch) | |
| tree | 402789a0fa44824a74c880828161b61394d392b2 /drivers/net | |
| parent | ethoc: Move the Avionic driver (diff) | |
| download | linux-1fe003fd4247edf0d1ccf32061b046b90492a954.tar.xz linux-1fe003fd4247edf0d1ccf32061b046b90492a954.zip | |
greth: Move the Aeroflex Gaisler driver
Move the Aeroflex Gaisler driver into drivers/net/ethernet/aeroflex/
and make the necessary Kconfig and Makefile changes.
CC: Kristoffer Glembo <kristoffer@gaisler.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/Kconfig | 8 | ||||
| -rw-r--r-- | drivers/net/Makefile | 1 | ||||
| -rw-r--r-- | drivers/net/ethernet/Kconfig | 1 | ||||
| -rw-r--r-- | drivers/net/ethernet/Makefile | 1 | ||||
| -rw-r--r-- | drivers/net/ethernet/aeroflex/Kconfig | 11 | ||||
| -rw-r--r-- | drivers/net/ethernet/aeroflex/Makefile | 5 | ||||
| -rw-r--r-- | drivers/net/ethernet/aeroflex/greth.c (renamed from drivers/net/greth.c) | 0 | ||||
| -rw-r--r-- | drivers/net/ethernet/aeroflex/greth.h (renamed from drivers/net/greth.h) | 0 |
8 files changed, 18 insertions, 9 deletions
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index fe2a8bc7d0de..75ca0da52ea2 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig @@ -291,14 +291,6 @@ config ENC28J60_WRITEVERIFY Enable the verify after the buffer write useful for debugging purpose. If unsure, say N. -config GRETH - tristate "Aeroflex Gaisler GRETH Ethernet MAC support" - depends on SPARC - select PHYLIB - select CRC32 - help - Say Y here if you want to use the Aeroflex Gaisler GRETH Ethernet MAC. - config NET_PCI bool "EISA, VLB, PCI and on board controllers" depends on ISA || EISA || PCI diff --git a/drivers/net/Makefile b/drivers/net/Makefile index 4e74d93476bc..e2f1f554dd73 100644 --- a/drivers/net/Makefile +++ b/drivers/net/Makefile @@ -54,7 +54,6 @@ obj-$(CONFIG_VETH) += veth.o obj-$(CONFIG_NET_NETX) += netx-eth.o obj-$(CONFIG_DM9000) += dm9000.o obj-$(CONFIG_ENC28J60) += enc28j60.o -obj-$(CONFIG_GRETH) += greth.o obj-$(CONFIG_DEV_APPLETALK) += appletalk/ obj-$(CONFIG_ETHERNET) += ethernet/ diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig index e89bb2790855..32561c71040d 100644 --- a/drivers/net/ethernet/Kconfig +++ b/drivers/net/ethernet/Kconfig @@ -13,6 +13,7 @@ if ETHERNET source "drivers/net/ethernet/3com/Kconfig" source "drivers/net/ethernet/adaptec/Kconfig" +source "drivers/net/ethernet/aeroflex/Kconfig" source "drivers/net/ethernet/amd/Kconfig" source "drivers/net/ethernet/apple/Kconfig" source "drivers/net/ethernet/atheros/Kconfig" diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile index 5ef1218a6e8e..94f1be8e822b 100644 --- a/drivers/net/ethernet/Makefile +++ b/drivers/net/ethernet/Makefile @@ -5,6 +5,7 @@ obj-$(CONFIG_NET_VENDOR_3COM) += 3com/ obj-$(CONFIG_NET_VENDOR_8390) += 8390/ obj-$(CONFIG_NET_VENDOR_ADAPTEC) += adaptec/ +obj-$(CONFIG_GRETH) += aeroflex/ obj-$(CONFIG_NET_VENDOR_AMD) += amd/ obj-$(CONFIG_NET_VENDOR_APPLE) += apple/ obj-$(CONFIG_NET_VENDOR_ATHEROS) += atheros/ diff --git a/drivers/net/ethernet/aeroflex/Kconfig b/drivers/net/ethernet/aeroflex/Kconfig new file mode 100644 index 000000000000..4f4a8d78fd54 --- /dev/null +++ b/drivers/net/ethernet/aeroflex/Kconfig @@ -0,0 +1,11 @@ +# +# Aeroflex Gaisler network device configuration +# + +config GRETH + tristate "Aeroflex Gaisler GRETH Ethernet MAC support" + depends on SPARC + select PHYLIB + select CRC32 + ---help--- + Say Y here if you want to use the Aeroflex Gaisler GRETH Ethernet MAC. diff --git a/drivers/net/ethernet/aeroflex/Makefile b/drivers/net/ethernet/aeroflex/Makefile new file mode 100644 index 000000000000..6e62a679282f --- /dev/null +++ b/drivers/net/ethernet/aeroflex/Makefile @@ -0,0 +1,5 @@ +# +# Makefile for the Aeroflex Gaisler network device drivers. +# + +obj-$(CONFIG_GRETH) += greth.o diff --git a/drivers/net/greth.c b/drivers/net/ethernet/aeroflex/greth.c index 16ce45c11934..16ce45c11934 100644 --- a/drivers/net/greth.c +++ b/drivers/net/ethernet/aeroflex/greth.c diff --git a/drivers/net/greth.h b/drivers/net/ethernet/aeroflex/greth.h index 9a0040dee4da..9a0040dee4da 100644 --- a/drivers/net/greth.h +++ b/drivers/net/ethernet/aeroflex/greth.h |