diff options
| author | David S. Miller <davem@davemloft.net> | 2009-02-24 06:50:29 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-02-24 06:50:29 -0500 |
| commit | e70049b9e74267dd47e1ffa62302073487afcb48 (patch) | |
| tree | 2cd000c0751ef31c9044b020d63f278cdf4f332d /drivers/net/Kconfig | |
| parent | d18921a0e319ab512f8186b1b1142c7b8634c779 (diff) | |
| parent | f7e603ad8f78cd3b59e33fa72707da0cbabdf699 (diff) | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
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 683a5ac4e122..7159a39aa2b9 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig | |||
| @@ -2352,6 +2352,17 @@ config ATL1E | |||
| 2352 | To compile this driver as a module, choose M here. The module | 2352 | To compile this driver as a module, choose M here. The module |
| 2353 | will be called atl1e. | 2353 | will be called atl1e. |
| 2354 | 2354 | ||
| 2355 | config ATL1C | ||
| 2356 | tristate "Atheros L1C Gigabit Ethernet support (EXPERIMENTAL)" | ||
| 2357 | depends on PCI && EXPERIMENTAL | ||
| 2358 | select CRC32 | ||
| 2359 | select MII | ||
| 2360 | help | ||
| 2361 | This driver supports the Atheros L1C gigabit ethernet adapter. | ||
| 2362 | |||
| 2363 | To compile this driver as a module, choose M here. The module | ||
| 2364 | will be called atl1c. | ||
| 2365 | |||
| 2355 | config JME | 2366 | config JME |
| 2356 | tristate "JMicron(R) PCI-Express Gigabit Ethernet support" | 2367 | tristate "JMicron(R) PCI-Express Gigabit Ethernet support" |
| 2357 | depends on PCI | 2368 | depends on PCI |