diff options
| author | Paul Mackerras <paulus@samba.org> | 2008-06-08 22:19:41 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-06-08 22:19:41 -0400 |
| commit | 8a3e1c670e503ddd6f6c373b307f38b783ee3a50 (patch) | |
| tree | 03094e8425b750d2693a271ebc89b49312e5476a /drivers/net/Kconfig | |
| parent | e026892c85571e12f11abffde5a90bcc704d663e (diff) | |
| parent | 60d5019be8acef268f4676d229c490186d338fbc (diff) | |
Merge branch 'merge'
Conflicts:
arch/powerpc/sysdev/fsl_soc.c
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 b1ca6f2a44e8..8e3e968b2957 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 && MEMORY_HOTPLUG | 2428 | depends on IBMEBUS && INET && SPARSEMEM |
| 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. |