diff options
| author | Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2011-06-15 10:17:58 -0700 |
|---|---|---|
| committer | Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2011-08-12 03:41:22 -0700 |
| commit | 63d24a0eb71b1ec5ed302816379aaf76eecb053c (patch) | |
| tree | d277238b203e8cdcf4bf63e58192a68c40f46ece | |
| parent | c23c5c1663b36c1428df32d1645232662459e02f (diff) | |
| download | linux-63d24a0eb71b1ec5ed302816379aaf76eecb053c.tar.bz2 | |
jme: Move the JME driver
Move the JME driver into drivers/net/ethernet/ and make the
necessary Kconfig and Makefile changes.
CC: Guo-Fu Tseng <cooldavid@cooldavid.org>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
| -rw-r--r-- | MAINTAINERS | 2 | ||||
| -rw-r--r-- | drivers/net/Kconfig | 12 | ||||
| -rw-r--r-- | drivers/net/Makefile | 1 | ||||
| -rw-r--r-- | drivers/net/ethernet/Kconfig | 13 | ||||
| -rw-r--r-- | drivers/net/ethernet/Makefile | 1 | ||||
| -rw-r--r-- | drivers/net/ethernet/jme.c (renamed from drivers/net/jme.c) | 0 | ||||
| -rw-r--r-- | drivers/net/ethernet/jme.h (renamed from drivers/net/jme.h) | 0 |
7 files changed, 15 insertions, 14 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 622f4fc7968c..37cbe1495c6e 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3591,7 +3591,7 @@ JME NETWORK DRIVER M: Guo-Fu Tseng <cooldavid@cooldavid.org> L: netdev@vger.kernel.org S: Maintained -F: drivers/net/jme.* +F: drivers/net/ethernet/jme.* JOURNALLING FLASH FILE SYSTEM V2 (JFFS2) M: David Woodhouse <dwmw2@infradead.org> diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index b89662182825..996bae006fc3 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig @@ -547,18 +547,6 @@ config XILINX_LL_TEMAC This driver supports the Xilinx 10/100/1000 LocalLink TEMAC core used in Xilinx Spartan and Virtex FPGAs -config JME - tristate "JMicron(R) PCI-Express Gigabit Ethernet support" - depends on PCI - select CRC32 - select MII - ---help--- - This driver supports the PCI-Express gigabit ethernet adapters - based on JMicron JMC250 chipset. - - To compile this driver as a module, choose M here. The module - will be called jme. - endif # NETDEV_1000 # diff --git a/drivers/net/Makefile b/drivers/net/Makefile index 648fa5cac457..271fc52138de 100644 --- a/drivers/net/Makefile +++ b/drivers/net/Makefile @@ -8,7 +8,6 @@ obj-$(CONFIG_PHYLIB) += phy/ obj-$(CONFIG_IP1000) += ipg.o obj-$(CONFIG_CAN) += can/ obj-$(CONFIG_BONDING) += bonding/ -obj-$(CONFIG_JME) += jme.o obj-$(CONFIG_VMXNET3) += vmxnet3/ # diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig index 70c60ef7ac74..c29c1457aa9a 100644 --- a/drivers/net/ethernet/Kconfig +++ b/drivers/net/ethernet/Kconfig @@ -31,6 +31,19 @@ source "drivers/net/ethernet/ibm/Kconfig" source "drivers/net/ethernet/intel/Kconfig" source "drivers/net/ethernet/i825xx/Kconfig" source "drivers/net/ethernet/xscale/Kconfig" + +config JME + tristate "JMicron(R) PCI-Express Gigabit Ethernet support" + depends on PCI + select CRC32 + select MII + ---help--- + This driver supports the PCI-Express gigabit ethernet adapters + based on JMicron JMC250 chipset. + + To compile this driver as a module, choose M here. The module + will be called jme. + source "drivers/net/ethernet/marvell/Kconfig" source "drivers/net/ethernet/mellanox/Kconfig" source "drivers/net/ethernet/micrel/Kconfig" diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile index 929ee29007cc..8495c507725c 100644 --- a/drivers/net/ethernet/Makefile +++ b/drivers/net/ethernet/Makefile @@ -23,6 +23,7 @@ obj-$(CONFIG_NET_VENDOR_IBM) += ibm/ obj-$(CONFIG_NET_VENDOR_INTEL) += intel/ obj-$(CONFIG_NET_VENDOR_I825XX) += i825xx/ obj-$(CONFIG_NET_VENDOR_XSCALE) += xscale/ +obj-$(CONFIG_JME) += jme.o obj-$(CONFIG_NET_VENDOR_MARVELL) += marvell/ obj-$(CONFIG_NET_VENDOR_MELLANOX) += mellanox/ obj-$(CONFIG_NET_VENDOR_MICREL) += micrel/ diff --git a/drivers/net/jme.c b/drivers/net/ethernet/jme.c index 3ac262f55633..3ac262f55633 100644 --- a/drivers/net/jme.c +++ b/drivers/net/ethernet/jme.c diff --git a/drivers/net/jme.h b/drivers/net/ethernet/jme.h index c1f8b893e2ea..c1f8b893e2ea 100644 --- a/drivers/net/jme.h +++ b/drivers/net/ethernet/jme.h |