diff options
author | Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2011-07-30 03:36:02 -0400 |
---|---|---|
committer | Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2011-08-12 03:27:04 -0400 |
commit | 8df158ac36fa0937f51c372f0c2d0ad1b86ebe4c (patch) | |
tree | 320edf6c6b8ecc035b77ac8e91974d870490ad92 /drivers/net/Kconfig | |
parent | bcc9736c6c201b0992c9d0a5b5a30c35138e5782 (diff) |
toshiba: Move the Toshiba drivers
Move the Toshiba ethernet drivers into drivers/net/ethernet/toshiba
and make the necessary Kconfig and Makefile changes.
CC: Geoff Levand <geoff@infradead.org>
CC: Jens Osterkamp <Jens.Osterkamp@de.ibm.com>
CC: Ishizaki Kou <kou.ishizaki@toshiba.co.jp>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Diffstat (limited to 'drivers/net/Kconfig')
-rw-r--r-- | drivers/net/Kconfig | 37 |
1 files changed, 0 insertions, 37 deletions
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index a6edd3546fe9..1e1df3d79850 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig | |||
@@ -478,11 +478,6 @@ config FORCEDETH | |||
478 | To compile this driver as a module, choose M here. The module | 478 | To compile this driver as a module, choose M here. The module |
479 | will be called forcedeth. | 479 | will be called forcedeth. |
480 | 480 | ||
481 | config TC35815 | ||
482 | tristate "TOSHIBA TC35815 Ethernet support" | ||
483 | depends on NET_PCI && PCI && MIPS | ||
484 | select PHYLIB | ||
485 | |||
486 | config FEALNX | 481 | config FEALNX |
487 | tristate "Myson MTD-8xx PCI Ethernet support" | 482 | tristate "Myson MTD-8xx PCI Ethernet support" |
488 | depends on NET_PCI && PCI | 483 | depends on NET_PCI && PCI |
@@ -658,15 +653,6 @@ config SIS190 | |||
658 | To compile this driver as a module, choose M here: the module | 653 | To compile this driver as a module, choose M here: the module |
659 | will be called sis190. This is recommended. | 654 | will be called sis190. This is recommended. |
660 | 655 | ||
661 | config SPIDER_NET | ||
662 | tristate "Spider Gigabit Ethernet driver" | ||
663 | depends on PCI && (PPC_IBM_CELL_BLADE || PPC_CELLEB) | ||
664 | select FW_LOADER | ||
665 | select SUNGEM_PHY | ||
666 | help | ||
667 | This driver supports the Gigabit Ethernet chips present on the | ||
668 | Cell Processor-Based Blades from IBM. | ||
669 | |||
670 | config TSI108_ETH | 656 | config TSI108_ETH |
671 | tristate "Tundra TSI108 gigabit Ethernet support" | 657 | tristate "Tundra TSI108 gigabit Ethernet support" |
672 | depends on TSI108_BRIDGE | 658 | depends on TSI108_BRIDGE |
@@ -675,29 +661,6 @@ config TSI108_ETH | |||
675 | To compile this driver as a module, choose M here: the module | 661 | To compile this driver as a module, choose M here: the module |
676 | will be called tsi108_eth. | 662 | will be called tsi108_eth. |
677 | 663 | ||
678 | config GELIC_NET | ||
679 | tristate "PS3 Gigabit Ethernet driver" | ||
680 | depends on PPC_PS3 | ||
681 | select PS3_SYS_MANAGER | ||
682 | help | ||
683 | This driver supports the network device on the PS3 game | ||
684 | console. This driver has built-in support for Ethernet. | ||
685 | |||
686 | To compile this driver as a module, choose M here: the | ||
687 | module will be called ps3_gelic. | ||
688 | |||
689 | config GELIC_WIRELESS | ||
690 | bool "PS3 Wireless support" | ||
691 | depends on WLAN | ||
692 | depends on GELIC_NET | ||
693 | select WIRELESS_EXT | ||
694 | help | ||
695 | This option adds the support for the wireless feature of PS3. | ||
696 | If you have the wireless-less model of PS3 or have no plan to | ||
697 | use wireless feature, disabling this option saves memory. As | ||
698 | the driver automatically distinguishes the models, you can | ||
699 | safely enable this option even if you have a wireless-less model. | ||
700 | |||
701 | config XILINX_LL_TEMAC | 664 | config XILINX_LL_TEMAC |
702 | tristate "Xilinx LL TEMAC (LocalLink Tri-mode Ethernet MAC) driver" | 665 | tristate "Xilinx LL TEMAC (LocalLink Tri-mode Ethernet MAC) driver" |
703 | depends on PPC || MICROBLAZE | 666 | depends on PPC || MICROBLAZE |