diff options
| author | David S. Miller <davem@davemloft.net> | 2008-06-13 23:52:39 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-06-13 23:52:39 -0400 |
| commit | 4ae127d1b6c71f9240dd4245f240e6dd8fc98014 (patch) | |
| tree | b7aa27b3e0c655f4613fe2146cb57d7f69e421f6 /drivers/net/Kconfig | |
| parent | 875ec4333b99144e2589e900a0bcd2c25c757b27 (diff) | |
| parent | 7775c9753b94fe429dc4323360d6502c95e0dd6e (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/smc911x.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 40eb24d6d755..20b5367f7e0b 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig | |||
| @@ -2453,7 +2453,7 @@ config CHELSIO_T3 | |||
| 2453 | 2453 | ||
| 2454 | config EHEA | 2454 | config EHEA |
| 2455 | tristate "eHEA Ethernet support" | 2455 | tristate "eHEA Ethernet support" |
| 2456 | depends on IBMEBUS && INET && SPARSEMEM && MEMORY_HOTPLUG | 2456 | depends on IBMEBUS && INET && SPARSEMEM |
| 2457 | select INET_LRO | 2457 | select INET_LRO |
| 2458 | ---help--- | 2458 | ---help--- |
| 2459 | This driver supports the IBM pSeries eHEA ethernet adapter. | 2459 | This driver supports the IBM pSeries eHEA ethernet adapter. |