[POWERPC] spufs: split the Cell BE support into generic and platform dependant parts

[safe/jmp/linux-2.6] / drivers / net / Kconfig

diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 00993e8..c71209b 100644 (file)
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -2171,18 +2171,19 @@ config BNX2
 
 config SPIDER_NET
        tristate "Spider Gigabit Ethernet driver"
-       depends on PCI && PPC_CELL
+       depends on PCI && PPC_IBM_CELL_BLADE
+       select FW_LOADER
        help
          This driver supports the Gigabit Ethernet chips present on the
          Cell Processor-Based Blades from IBM.
 
 config GIANFAR
        tristate "Gianfar Ethernet"
-       depends on 85xx || 83xx
+       depends on 85xx || 83xx || PPC_86xx
        select PHYLIB
        help
-         This driver supports the Gigabit TSEC on the MPC85xx 
-         family of chips, and the FEC on the 8540
+         This driver supports the Gigabit TSEC on the MPC83xx, MPC85xx,
+         and MPC86xx family of chips, and the FEC on the 8540.
 
 config GFAR_NAPI
        bool "NAPI Support"
@@ -2312,13 +2313,11 @@ config S2IO_NAPI
 
 endmenu
 
-if !UML
 source "drivers/net/tokenring/Kconfig"
 
 source "drivers/net/wireless/Kconfig"
 
 source "drivers/net/pcmcia/Kconfig"
-endif
 
 source "drivers/net/wan/Kconfig"