Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1c1538be authored by Jeff Kirsher's avatar Jeff Kirsher
Browse files

pch_gbe: Move the OKI Semiconductor driver 



Move the OKI Semiconductor driver into driver/net/ethernet/oki-semi/
and make the necessary Kconfig and Makefile changes.

Note: there is no documented maintainer for this driver, so I CC'd
the last 2 major contributors.

CC: Tomoya <tomoya-linux@dsn.okisemi.com>
CC: Toshiharu Okada <toshiharu-linux@dsn.okisemi.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 9e13fbf7

drivers/net/Kconfig

+0 −19
Original line number Original line Diff line number Diff line
@@ -996,25 +996,6 @@ config S6GMAC 
	  To compile this driver as a module, choose M here. The module

	  To compile this driver as a module, choose M here. The module

	  will be called s6gmac.

	  will be called s6gmac.





config PCH_GBE

	tristate "Intel EG20T PCH / OKI SEMICONDUCTOR ML7223 IOH GbE"

	depends on PCI

	select MII

	---help---

	  This is a gigabit ethernet driver for EG20T PCH.

	  EG20T PCH is the platform controller hub that is used in Intel's

	  general embedded platform.

	  EG20T PCH has Gigabit Ethernet interface.

	  Using this interface, it is able to access system devices connected

	  to Gigabit Ethernet.

	  This driver enables Gigabit Ethernet function.



	  This driver also can be used for OKI SEMICONDUCTOR IOH(Input/

	  Output Hub), ML7223.

	  ML7223 IOH is for MP(Media Phone) use.

	  ML7223 is companion chip for Intel Atom E6xx series.

	  ML7223 is completely compatible for Intel EG20T PCH.



endif # NETDEV_1000

endif # NETDEV_1000





#

#

drivers/net/Makefile

+0 −1
Original line number Original line Diff line number Diff line
@@ -156,5 +156,4 @@ obj-$(CONFIG_WIMAX) += wimax/ 
obj-$(CONFIG_CAIF) += caif/

obj-$(CONFIG_CAIF) += caif/





obj-$(CONFIG_OCTEON_MGMT_ETHERNET) += octeon/

obj-$(CONFIG_OCTEON_MGMT_ETHERNET) += octeon/

obj-$(CONFIG_PCH_GBE) += pch_gbe/

obj-$(CONFIG_TILE_NET) += tile/
 
obj-$(CONFIG_TILE_NET) += tile/

drivers/net/ethernet/Kconfig

+1 −0
Original line number Original line Diff line number Diff line
@@ -32,6 +32,7 @@ source "drivers/net/ethernet/mellanox/Kconfig" 
source "drivers/net/ethernet/myricom/Kconfig"

source "drivers/net/ethernet/myricom/Kconfig"

source "drivers/net/ethernet/natsemi/Kconfig"

source "drivers/net/ethernet/natsemi/Kconfig"

source "drivers/net/ethernet/8390/Kconfig"

source "drivers/net/ethernet/8390/Kconfig"

source "drivers/net/ethernet/oki-semi/Kconfig"

source "drivers/net/ethernet/pasemi/Kconfig"

source "drivers/net/ethernet/pasemi/Kconfig"

source "drivers/net/ethernet/qlogic/Kconfig"

source "drivers/net/ethernet/qlogic/Kconfig"

source "drivers/net/ethernet/racal/Kconfig"

source "drivers/net/ethernet/racal/Kconfig"

drivers/net/ethernet/Makefile

+1 −0
Original line number Original line Diff line number Diff line
@@ -23,6 +23,7 @@ obj-$(CONFIG_NET_VENDOR_XSCALE) += xscale/ 
obj-$(CONFIG_NET_VENDOR_MELLANOX) += mellanox/

obj-$(CONFIG_NET_VENDOR_MELLANOX) += mellanox/

obj-$(CONFIG_NET_VENDOR_MYRI) += myricom/

obj-$(CONFIG_NET_VENDOR_MYRI) += myricom/

obj-$(CONFIG_NET_VENDOR_NATSEMI) += natsemi/

obj-$(CONFIG_NET_VENDOR_NATSEMI) += natsemi/

obj-$(CONFIG_NET_VENDOR_OKI) += oki-semi/

obj-$(CONFIG_NET_VENDOR_PASEMI) += pasemi/

obj-$(CONFIG_NET_VENDOR_PASEMI) += pasemi/

obj-$(CONFIG_NET_VENDOR_QLOGIC) += qlogic/

obj-$(CONFIG_NET_VENDOR_QLOGIC) += qlogic/

obj-$(CONFIG_NET_VENDOR_RACAL) += racal/

obj-$(CONFIG_NET_VENDOR_RACAL) += racal/

drivers/net/ethernet/oki-semi/Kconfig

0 → 100644
+22 −0
Original line number Original line Diff line number Diff line 
#

# OKI Semiconductor device configuration

#



config NET_VENDOR_OKI

	bool "OKI Semiconductor devices"

	depends on PCI

	---help---

	  If you have a network (Ethernet) card belonging to this class, say Y

	  and read the Ethernet-HOWTO, available from

	  <http://www.tldp.org/docs.html#howto>.



	  Note that the answer to this question doesn't directly affect the

	  kernel: saying N will just cause the configurator to skip all

	  the questions about OKI Semiconductor cards. If you say Y, you will

	  be asked for your specific card in the following questions.



if NET_VENDOR_OKI



source "drivers/net/ethernet/oki-semi/pch_gbe/Kconfig"



endif # NET_VENDOR_OKI