diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-03-23 17:13:43 -0500 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-03-23 17:13:43 -0500 |
| commit | 88e3c1da8b3258a81c5c81d4e7e22557b7d71ba7 (patch) | |
| tree | ab518773c0ff4606f1a57d00b5931332a7e1d96e /drivers/net/Kconfig | |
| parent | fa4fa40a990f8f4eff65476bef32007c154bbac0 (diff) | |
| parent | b0e6e962992b76580f4900b166a337bad7c1e81b (diff) | |
Merge branch 'master'
Diffstat (limited to 'drivers/net/Kconfig')
| -rw-r--r-- | drivers/net/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index 00993e8ba589..e20b849a22e8 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig | |||
| @@ -2172,6 +2172,7 @@ config BNX2 | |||
| 2172 | config SPIDER_NET | 2172 | config SPIDER_NET |
| 2173 | tristate "Spider Gigabit Ethernet driver" | 2173 | tristate "Spider Gigabit Ethernet driver" |
| 2174 | depends on PCI && PPC_CELL | 2174 | depends on PCI && PPC_CELL |
| 2175 | select FW_LOADER | ||
| 2175 | help | 2176 | help |
| 2176 | This driver supports the Gigabit Ethernet chips present on the | 2177 | This driver supports the Gigabit Ethernet chips present on the |
| 2177 | Cell Processor-Based Blades from IBM. | 2178 | Cell Processor-Based Blades from IBM. |