diff options
| author | Paul Mackerras <paulus@samba.org> | 2008-06-09 04:19:41 +0200 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-06-09 04:19:41 +0200 |
| commit | 8a3e1c670e503ddd6f6c373b307f38b783ee3a50 (patch) | |
| tree | 03094e8425b750d2693a271ebc89b49312e5476a /drivers/net/Kconfig | |
| parent | [POWERPC] fsl: Update fsl_soc to use cell-index property of I2C nodes (diff) | |
| parent | [POWERPC] ehea: Remove dependency on MEMORY_HOTPLUG (diff) | |
| download | linux-8a3e1c670e503ddd6f6c373b307f38b783ee3a50.tar.xz linux-8a3e1c670e503ddd6f6c373b307f38b783ee3a50.zip | |
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 config EHEA tristate "eHEA Ethernet support" - depends on IBMEBUS && INET && SPARSEMEM && MEMORY_HOTPLUG + depends on IBMEBUS && INET && SPARSEMEM select INET_LRO ---help--- This driver supports the IBM pSeries eHEA ethernet adapter. |