diff options
| author | Paul Mackerras <paulus@samba.org> | 2008-05-16 09:13:42 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-05-16 09:13:42 -0400 |
| commit | fcff474ea5cb17ff015aa40e92ed86fede41f1e2 (patch) | |
| tree | a99c0e14daaf31cb078812fb2fbc6abadfcd738f /drivers/net/Kconfig | |
| parent | 541b2755c2ef7dd2242ac606c115daa11e43ef69 (diff) | |
| parent | f26a3988917913b3d11b2bd741601a2c64ab9204 (diff) | |
Merge branch 'linux-2.6' into powerpc-next
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 009e8fdcfe5c..02d5165b147c 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig | |||
| @@ -2425,7 +2425,7 @@ config CHELSIO_T3 | |||
| 2425 | 2425 | ||
| 2426 | config EHEA | 2426 | config EHEA |
| 2427 | tristate "eHEA Ethernet support" | 2427 | tristate "eHEA Ethernet support" |
| 2428 | depends on IBMEBUS && INET && SPARSEMEM | 2428 | depends on IBMEBUS && INET && SPARSEMEM && MEMORY_HOTPLUG |
| 2429 | select INET_LRO | 2429 | select INET_LRO |
| 2430 | ---help--- | 2430 | ---help--- |
| 2431 | This driver supports the IBM pSeries eHEA ethernet adapter. | 2431 | This driver supports the IBM pSeries eHEA ethernet adapter. |