diff options
| author | David S. Miller <davem@davemloft.net> | 2008-03-05 15:26:41 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-03-05 15:26:41 -0500 |
| commit | 255333c1db3ec63921de29b134418a4e56e5921e (patch) | |
| tree | b1cd99373cabfa6fed020496d4d74500e7bc7e92 /drivers/net/Kconfig | |
| parent | 9a43b709a230705ca40a6f854a334a02334a3c1c (diff) | |
| parent | 0d66afe7805b169b6bf3c7a88cf8163298b8ef05 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
net/mac80211/rc80211_pid_algo.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 a0f0e605d630..a64bb415f10c 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig | |||
| @@ -2519,7 +2519,7 @@ config CHELSIO_T3 | |||
| 2519 | 2519 | ||
| 2520 | config EHEA | 2520 | config EHEA |
| 2521 | tristate "eHEA Ethernet support" | 2521 | tristate "eHEA Ethernet support" |
| 2522 | depends on IBMEBUS && INET | 2522 | depends on IBMEBUS && INET && SPARSEMEM |
| 2523 | select INET_LRO | 2523 | select INET_LRO |
| 2524 | ---help--- | 2524 | ---help--- |
| 2525 | This driver supports the IBM pSeries eHEA ethernet adapter. | 2525 | This driver supports the IBM pSeries eHEA ethernet adapter. |