diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-06-09 19:23:29 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-06-09 19:23:29 +0200 |
| commit | 64a3dcd5d33d0c5253de2eba31b28a197d3e5e6b (patch) | |
| tree | 1a2ef97251cbdb2f024a86d07efc81b684f91685 /drivers | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6.26 (diff) | |
| parent | [POWERPC] ehea: Remove dependency on MEMORY_HOTPLUG (diff) | |
| download | linux-64a3dcd5d33d0c5253de2eba31b28a197d3e5e6b.tar.xz linux-64a3dcd5d33d0c5253de2eba31b28a197d3e5e6b.zip | |
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc:
[POWERPC] ehea: Remove dependency on MEMORY_HOTPLUG
[POWERPC] Make walk_memory_resource available with MEMORY_HOTPLUG=n
[POWERPC] Use dev_set_name in pci_64.c
[POWERPC] Fix incorrect enabling of VMX when building signal or user context
[POWERPC] boot/Makefile CONFIG_ variable fixes
Diffstat (limited to 'drivers')
| -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 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. |