diff options
| author | Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2011-05-13 14:29:12 -0700 |
|---|---|---|
| committer | Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2011-08-11 02:41:59 -0700 |
| commit | 9aa3283595451ca093500ff0977b106e1f465586 (patch) | |
| tree | 89cd128f037b029b67f73fbff7d8cc38177c2b27 /drivers/net/Kconfig | |
| parent | 86387e1ac4fcaa45ff5578013a78593d1a0ba279 (diff) | |
ehea/ibm*: Move the IBM drivers
Move the IBM drivers into drivers/net/ethernet/ibm/ and make the
necessary Kconfig and Makefile changes.
- Renamed ibm_new_emac to emac
- Cleaned up Makefile and Kconfig options which referred to
IBM_NEW_EMAC to IBM_EMAC
- ibmlana driver is a National Semiconductor SONIC driver so
it was not moved
CC: Christoph Raisch <raisch@de.ibm.com>
CC: Santiago Leon <santil@linux.vnet.ibm.com>
CC: Benjamin Herrenschmidt <benh@kernel.crashing.org>
CC: David Gibson <dwg@au1.ibm.com>
CC: Kyle Lucke <klucke@us.ibm.com>
CC: Michael Ellerman <michael@ellerman.id.au>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Diffstat (limited to 'drivers/net/Kconfig')
| -rw-r--r-- | drivers/net/Kconfig | 26 |
1 files changed, 0 insertions, 26 deletions
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index 3e216b3ed100..116f7442e70c 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig @@ -627,18 +627,6 @@ config IBMLANA boards with this driver should be possible, but has not been tested up to now due to lack of hardware. -config IBMVETH - tristate "IBM LAN Virtual Ethernet support" - depends on PPC_PSERIES - ---help--- - This driver supports virtual ethernet adapters on newer IBM iSeries - and pSeries systems. - - To compile this driver as a module, choose M here. The module will - be called ibmveth. - -source "drivers/net/ibm_newemac/Kconfig" - config NET_PCI bool "EISA, VLB, PCI and on board controllers" depends on ISA || EISA || PCI @@ -1469,16 +1457,6 @@ if NETDEV_10000 config MDIO tristate -config EHEA - tristate "eHEA Ethernet support" - depends on IBMEBUS && INET && SPARSEMEM - select INET_LRO - ---help--- - This driver supports the IBM pSeries eHEA ethernet adapter. - - To compile the driver as a module, choose M here. The module - will be called ehea. - config ENIC tristate "Cisco VIC Ethernet NIC Support" depends on PCI && INET @@ -1573,10 +1551,6 @@ config XEN_NETDEV_BACKEND compile this driver as a module, chose M here: the module will be called xen-netback. -config ISERIES_VETH - tristate "iSeries Virtual Ethernet driver support" - depends on PPC_ISERIES - config RIONET tristate "RapidIO Ethernet over messaging driver support" depends on RAPIDIO |