mirror of
https://github.com/Fishwaldo/Star64_linux.git
synced 2025-07-23 23:32:14 +00:00
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>
This commit is contained in:
parent
c23c5c1663
commit
63d24a0eb7
7 changed files with 15 additions and 14 deletions
|
@ -3591,7 +3591,7 @@ JME NETWORK DRIVER
|
||||||
M: Guo-Fu Tseng <cooldavid@cooldavid.org>
|
M: Guo-Fu Tseng <cooldavid@cooldavid.org>
|
||||||
L: netdev@vger.kernel.org
|
L: netdev@vger.kernel.org
|
||||||
S: Maintained
|
S: Maintained
|
||||||
F: drivers/net/jme.*
|
F: drivers/net/ethernet/jme.*
|
||||||
|
|
||||||
JOURNALLING FLASH FILE SYSTEM V2 (JFFS2)
|
JOURNALLING FLASH FILE SYSTEM V2 (JFFS2)
|
||||||
M: David Woodhouse <dwmw2@infradead.org>
|
M: David Woodhouse <dwmw2@infradead.org>
|
||||||
|
|
|
@ -547,18 +547,6 @@ config XILINX_LL_TEMAC
|
||||||
This driver supports the Xilinx 10/100/1000 LocalLink TEMAC
|
This driver supports the Xilinx 10/100/1000 LocalLink TEMAC
|
||||||
core used in Xilinx Spartan and Virtex FPGAs
|
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
|
endif # NETDEV_1000
|
||||||
|
|
||||||
#
|
#
|
||||||
|
|
|
@ -8,7 +8,6 @@ obj-$(CONFIG_PHYLIB) += phy/
|
||||||
obj-$(CONFIG_IP1000) += ipg.o
|
obj-$(CONFIG_IP1000) += ipg.o
|
||||||
obj-$(CONFIG_CAN) += can/
|
obj-$(CONFIG_CAN) += can/
|
||||||
obj-$(CONFIG_BONDING) += bonding/
|
obj-$(CONFIG_BONDING) += bonding/
|
||||||
obj-$(CONFIG_JME) += jme.o
|
|
||||||
obj-$(CONFIG_VMXNET3) += vmxnet3/
|
obj-$(CONFIG_VMXNET3) += vmxnet3/
|
||||||
|
|
||||||
#
|
#
|
||||||
|
|
|
@ -31,6 +31,19 @@ source "drivers/net/ethernet/ibm/Kconfig"
|
||||||
source "drivers/net/ethernet/intel/Kconfig"
|
source "drivers/net/ethernet/intel/Kconfig"
|
||||||
source "drivers/net/ethernet/i825xx/Kconfig"
|
source "drivers/net/ethernet/i825xx/Kconfig"
|
||||||
source "drivers/net/ethernet/xscale/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/marvell/Kconfig"
|
||||||
source "drivers/net/ethernet/mellanox/Kconfig"
|
source "drivers/net/ethernet/mellanox/Kconfig"
|
||||||
source "drivers/net/ethernet/micrel/Kconfig"
|
source "drivers/net/ethernet/micrel/Kconfig"
|
||||||
|
|
|
@ -23,6 +23,7 @@ obj-$(CONFIG_NET_VENDOR_IBM) += ibm/
|
||||||
obj-$(CONFIG_NET_VENDOR_INTEL) += intel/
|
obj-$(CONFIG_NET_VENDOR_INTEL) += intel/
|
||||||
obj-$(CONFIG_NET_VENDOR_I825XX) += i825xx/
|
obj-$(CONFIG_NET_VENDOR_I825XX) += i825xx/
|
||||||
obj-$(CONFIG_NET_VENDOR_XSCALE) += xscale/
|
obj-$(CONFIG_NET_VENDOR_XSCALE) += xscale/
|
||||||
|
obj-$(CONFIG_JME) += jme.o
|
||||||
obj-$(CONFIG_NET_VENDOR_MARVELL) += marvell/
|
obj-$(CONFIG_NET_VENDOR_MARVELL) += marvell/
|
||||||
obj-$(CONFIG_NET_VENDOR_MELLANOX) += mellanox/
|
obj-$(CONFIG_NET_VENDOR_MELLANOX) += mellanox/
|
||||||
obj-$(CONFIG_NET_VENDOR_MICREL) += micrel/
|
obj-$(CONFIG_NET_VENDOR_MICREL) += micrel/
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue