diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-07 20:22:43 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-07 20:22:43 -0400 |
| commit | 55faed1e607a24ca7f3453a3eb463ca8987f8139 (patch) | |
| tree | 70c1f910576713e799b5b409d9f4c3c56840526e /drivers/net/Kconfig | |
| parent | 946e91f36e90eea46758dd725b1c3b239f270f68 (diff) | |
| parent | 0edd5b44913cd0aba6f23b626b407f70bb3fb018 (diff) | |
Merge branch 'upstream' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Diffstat (limited to 'drivers/net/Kconfig')
| -rw-r--r-- | drivers/net/Kconfig | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index ae9e7a579b94..6bb9232514b4 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig | |||
| @@ -2058,6 +2058,13 @@ config BNX2 | |||
| 2058 | To compile this driver as a module, choose M here: the module | 2058 | To compile this driver as a module, choose M here: the module |
| 2059 | will be called bnx2. This is recommended. | 2059 | will be called bnx2. This is recommended. |
| 2060 | 2060 | ||
| 2061 | config SPIDER_NET | ||
| 2062 | tristate "Spider Gigabit Ethernet driver" | ||
| 2063 | depends on PCI && PPC_BPA | ||
| 2064 | help | ||
| 2065 | This driver supports the Gigabit Ethernet chips present on the | ||
| 2066 | Cell Processor-Based Blades from IBM. | ||
| 2067 | |||
| 2061 | config GIANFAR | 2068 | config GIANFAR |
| 2062 | tristate "Gianfar Ethernet" | 2069 | tristate "Gianfar Ethernet" |
| 2063 | depends on 85xx || 83xx | 2070 | depends on 85xx || 83xx |