diff options
| author | Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2011-06-25 14:53:13 +0400 |
|---|---|---|
| committer | Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2011-08-13 10:47:36 +0400 |
| commit | 37b937575b5a93a8fcbd4e1d553415f99381f650 (patch) | |
| tree | be31e45b7da810389b649eae242a0695f79cb743 | |
| parent | 7191047028471c74808291d35dd0502cf73e4d2a (diff) | |
| download | linux-37b937575b5a93a8fcbd4e1d553415f99381f650.tar.xz | |
sh_eth: Move the Renesas SuperH driver
Move the Renesas driver into drivers/net/ethernet/renesas/ and make
the necessary Kconfig and Makefile changes.
CC: Yoshihiro Shimoda <yoshihiro.shirmoda.uh@renesas.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
| -rw-r--r-- | drivers/net/Kconfig | 15 | ||||
| -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/renesas/Kconfig | 18 | ||||
| -rw-r--r-- | drivers/net/ethernet/renesas/Makefile | 5 | ||||
| -rw-r--r-- | drivers/net/ethernet/renesas/sh_eth.c (renamed from drivers/net/sh_eth.c) | 0 | ||||
| -rw-r--r-- | drivers/net/ethernet/renesas/sh_eth.h (renamed from drivers/net/sh_eth.h) | 0 |
8 files changed, 25 insertions, 16 deletions
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index 572ddf226f12..c83a1c0f0d45 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig @@ -221,21 +221,6 @@ menuconfig NET_ETHERNET if NET_ETHERNET -config SH_ETH - tristate "Renesas SuperH Ethernet support" - depends on SUPERH && \ - (CPU_SUBTYPE_SH7710 || CPU_SUBTYPE_SH7712 || \ - CPU_SUBTYPE_SH7763 || CPU_SUBTYPE_SH7619 || \ - CPU_SUBTYPE_SH7724 || CPU_SUBTYPE_SH7757) - select CRC32 - select MII - select MDIO_BITBANG - select PHYLIB - help - Renesas SuperH Ethernet device driver. - This driver supporting CPUs are: - - SH7710, SH7712, SH7763, SH7619, SH7724, and SH7757. - 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 8fa5b601c6b4..620abd76e0b5 100644 --- a/drivers/net/Makefile +++ b/drivers/net/Makefile @@ -18,7 +18,6 @@ obj-$(CONFIG_ROADRUNNER) += rrunner.o obj-$(CONFIG_SKFP) += skfp/ obj-$(CONFIG_RIONET) += rionet.o -obj-$(CONFIG_SH_ETH) += sh_eth.o # # end link order section diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig index 6e3619649f5f..df8940d0a7c8 100644 --- a/drivers/net/ethernet/Kconfig +++ b/drivers/net/ethernet/Kconfig @@ -133,6 +133,7 @@ source "drivers/net/ethernet/pasemi/Kconfig" source "drivers/net/ethernet/qlogic/Kconfig" source "drivers/net/ethernet/racal/Kconfig" source "drivers/net/ethernet/realtek/Kconfig" +source "drivers/net/ethernet/renesas/Kconfig" source "drivers/net/ethernet/rdc/Kconfig" config S6GMAC diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile index c274820ec29b..09f26b64a76a 100644 --- a/drivers/net/ethernet/Makefile +++ b/drivers/net/ethernet/Makefile @@ -53,6 +53,7 @@ obj-$(CONFIG_NET_VENDOR_PASEMI) += pasemi/ obj-$(CONFIG_NET_VENDOR_QLOGIC) += qlogic/ obj-$(CONFIG_NET_VENDOR_RACAL) += racal/ obj-$(CONFIG_NET_VENDOR_REALTEK) += realtek/ +obj-$(CONFIG_SH_ETH) += renesas/ obj-$(CONFIG_NET_VENDOR_RDC) += rdc/ obj-$(CONFIG_S6GMAC) += s6gmac.o obj-$(CONFIG_NET_VENDOR_SEEQ) += seeq/ diff --git a/drivers/net/ethernet/renesas/Kconfig b/drivers/net/ethernet/renesas/Kconfig new file mode 100644 index 000000000000..f57ae230817b --- /dev/null +++ b/drivers/net/ethernet/renesas/Kconfig @@ -0,0 +1,18 @@ +# +# Renesas device configuration +# + +config SH_ETH + tristate "Renesas SuperH Ethernet support" + depends on SUPERH && \ + (CPU_SUBTYPE_SH7710 || CPU_SUBTYPE_SH7712 || \ + CPU_SUBTYPE_SH7763 || CPU_SUBTYPE_SH7619 || \ + CPU_SUBTYPE_SH7724 || CPU_SUBTYPE_SH7757) + select CRC32 + select MII + select MDIO_BITBANG + select PHYLIB + ---help--- + Renesas SuperH Ethernet device driver. + This driver supporting CPUs are: + - SH7710, SH7712, SH7763, SH7619, SH7724, and SH7757. diff --git a/drivers/net/ethernet/renesas/Makefile b/drivers/net/ethernet/renesas/Makefile new file mode 100644 index 000000000000..1c278a8e066a --- /dev/null +++ b/drivers/net/ethernet/renesas/Makefile @@ -0,0 +1,5 @@ +# +# Makefile for the Renesas device drivers. +# + +obj-$(CONFIG_SH_ETH) += sh_eth.o diff --git a/drivers/net/sh_eth.c b/drivers/net/ethernet/renesas/sh_eth.c index ad35c210b839..ad35c210b839 100644 --- a/drivers/net/sh_eth.c +++ b/drivers/net/ethernet/renesas/sh_eth.c diff --git a/drivers/net/sh_eth.h b/drivers/net/ethernet/renesas/sh_eth.h index c3048a6ba676..c3048a6ba676 100644 --- a/drivers/net/sh_eth.h +++ b/drivers/net/ethernet/renesas/sh_eth.h |