diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-03-11 02:10:07 -0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-03-11 02:10:07 -0400 |
| commit | e14eee56c2280953c6e3d24d5dce42bd90836b81 (patch) | |
| tree | 21ab792d9ad6fbbab460058f352a0158f995644e /drivers/net/Kconfig | |
| parent | d6ee6f7e4c74d9a0fed7544f4d389bde004651d3 (diff) | |
| parent | 99adcd9d67aaf04e28f5ae96df280f236bde4b66 (diff) | |
Merge commit 'origin/master' into next
Diffstat (limited to 'drivers/net/Kconfig')
| -rw-r--r-- | drivers/net/Kconfig | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index 6bdfd47d679d..a2f185fd7072 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig | |||
| @@ -2342,6 +2342,17 @@ config ATL1E | |||
| 2342 | To compile this driver as a module, choose M here. The module | 2342 | To compile this driver as a module, choose M here. The module |
| 2343 | will be called atl1e. | 2343 | will be called atl1e. |
| 2344 | 2344 | ||
| 2345 | config ATL1C | ||
| 2346 | tristate "Atheros L1C Gigabit Ethernet support (EXPERIMENTAL)" | ||
| 2347 | depends on PCI && EXPERIMENTAL | ||
| 2348 | select CRC32 | ||
| 2349 | select MII | ||
| 2350 | help | ||
| 2351 | This driver supports the Atheros L1C gigabit ethernet adapter. | ||
| 2352 | |||
| 2353 | To compile this driver as a module, choose M here. The module | ||
| 2354 | will be called atl1c. | ||
| 2355 | |||
| 2345 | config JME | 2356 | config JME |
| 2346 | tristate "JMicron(R) PCI-Express Gigabit Ethernet support" | 2357 | tristate "JMicron(R) PCI-Express Gigabit Ethernet support" |
| 2347 | depends on PCI | 2358 | depends on PCI |