diff options
author | Paul Mackerras <paulus@samba.org> | 2008-05-16 15:13:42 +0200 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2008-05-16 15:13:42 +0200 |
commit | fcff474ea5cb17ff015aa40e92ed86fede41f1e2 (patch) | |
tree | a99c0e14daaf31cb078812fb2fbc6abadfcd738f /drivers/net/Kconfig | |
parent | [POWERPC] Fix sparse warnings in arch/powerpc/platforms/pseries (diff) | |
parent | Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/... (diff) | |
download | linux-fcff474ea5cb17ff015aa40e92ed86fede41f1e2.tar.xz linux-fcff474ea5cb17ff015aa40e92ed86fede41f1e2.zip |
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 config EHEA tristate "eHEA Ethernet support" - depends on IBMEBUS && INET && SPARSEMEM + depends on IBMEBUS && INET && SPARSEMEM && MEMORY_HOTPLUG select INET_LRO ---help--- This driver supports the IBM pSeries eHEA ethernet adapter. |