diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-06-16 05:21:27 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-06-16 05:21:27 -0400 |
| commit | 688d22e23ab1caacb2c36c615854294b58f2ea47 (patch) | |
| tree | 95c8163c0b1f56902f5537bc256d7e5507f56cee /drivers/net/Kconfig | |
| parent | 7e0edc1bc343231029084761ebf59e522902eb49 (diff) | |
| parent | 066519068ad2fbe98c7f45552b1f592903a9c8c8 (diff) | |
Merge branch 'linus' into x86/xen
Diffstat (limited to 'drivers/net/Kconfig')
| -rw-r--r-- | drivers/net/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index dd0ec9ebc939..f4182cfffe9d 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig | |||
| @@ -2426,7 +2426,7 @@ config CHELSIO_T3 | |||
| 2426 | 2426 | ||
| 2427 | config EHEA | 2427 | config EHEA |
| 2428 | tristate "eHEA Ethernet support" | 2428 | tristate "eHEA Ethernet support" |
| 2429 | depends on IBMEBUS && INET && SPARSEMEM && MEMORY_HOTPLUG | 2429 | depends on IBMEBUS && INET && SPARSEMEM |
| 2430 | select INET_LRO | 2430 | select INET_LRO |
| 2431 | ---help--- | 2431 | ---help--- |
| 2432 | This driver supports the IBM pSeries eHEA ethernet adapter. | 2432 | This driver supports the IBM pSeries eHEA ethernet adapter. |