diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-12-31 02:14:29 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-12-31 02:14:29 -0500 |
| commit | 5fdf7e5975a0b0f6a0370655612c5dca3fd6311b (patch) | |
| tree | 639c536e818c6ace974aa285ba94576df0353b01 /drivers/infiniband/Kconfig | |
| parent | 7a51cffbd10886c0557677dd916c090097c691ef (diff) | |
| parent | 6a94cb73064c952255336cc57731904174b2c58f (diff) | |
Merge branch 'linus' into tracing/kmemtrace
Conflicts:
mm/slub.c
Diffstat (limited to 'drivers/infiniband/Kconfig')
| -rw-r--r-- | drivers/infiniband/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/infiniband/Kconfig b/drivers/infiniband/Kconfig index a5dc78ae62d4..dd0db67bf8d7 100644 --- a/drivers/infiniband/Kconfig +++ b/drivers/infiniband/Kconfig | |||
| @@ -37,6 +37,7 @@ config INFINIBAND_USER_MEM | |||
| 37 | config INFINIBAND_ADDR_TRANS | 37 | config INFINIBAND_ADDR_TRANS |
| 38 | bool | 38 | bool |
| 39 | depends on INET | 39 | depends on INET |
| 40 | depends on !(INFINIBAND = y && IPV6 = m) | ||
| 40 | default y | 41 | default y |
| 41 | 42 | ||
| 42 | source "drivers/infiniband/hw/mthca/Kconfig" | 43 | source "drivers/infiniband/hw/mthca/Kconfig" |