diff options
author | Jens Osterkamp <Jens.Osterkamp@de.ibm.com> | 2005-09-05 18:19:29 -0400 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2005-09-06 22:17:49 -0400 |
commit | aaec0fab5f8809fe1509fdc204e769bb35ebe41a (patch) | |
tree | 8f2ae06374413dd9d3e56a12b0592be9bb58c6e5 /drivers/net/Kconfig | |
parent | 25097d4bda4a554d8b4a9989c7d8bcb67ef53f48 (diff) |
[PATCH] net: add driver for the NIC on Cell Blades
This patch adds a driver for a new 1000 Mbit ethernet NIC. It is
integrated on the south bridge that is used for our Cell Blades.
The code gets the MAC address from the Open Firmware device tree, so it
won't compile on platforms other than ppc64.
This is the first public release, so I don't expect the first version to
get merged, but I'd aim for integration within the 2.6.13 time frame.
Cc: Utz Bacher <utz.bacher@de.ibm.com>
Signed-off-by: Arnd Bergmann <arndb@de.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
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 |