diff options
| author | Paul Mackerras <paulus@samba.org> | 2007-05-10 07:08:37 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-05-10 07:08:37 -0400 |
| commit | 2ecf042ef530dd0943e41d84b6344f507941af3e (patch) | |
| tree | 73100361dd74e3f80f14c7c81ba4675948983f44 /drivers/infiniband/Kconfig | |
| parent | 32a56ebb24f23da1bbaf24292acf85b6c04526ab (diff) | |
| parent | de5603748af8bf7deac403e6ba92887f8d18e812 (diff) | |
Merge branch 'linux-2.6'
Diffstat (limited to 'drivers/infiniband/Kconfig')
| -rw-r--r-- | drivers/infiniband/Kconfig | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/infiniband/Kconfig b/drivers/infiniband/Kconfig index 66b36de9fa6f..37deaae49190 100644 --- a/drivers/infiniband/Kconfig +++ b/drivers/infiniband/Kconfig | |||
| @@ -29,6 +29,11 @@ config INFINIBAND_USER_ACCESS | |||
| 29 | libibverbs, libibcm and a hardware driver library from | 29 | libibverbs, libibcm and a hardware driver library from |
| 30 | <http://www.openib.org>. | 30 | <http://www.openib.org>. |
| 31 | 31 | ||
| 32 | config INFINIBAND_USER_MEM | ||
| 33 | bool | ||
| 34 | depends on INFINIBAND_USER_ACCESS != n | ||
| 35 | default y | ||
| 36 | |||
| 32 | config INFINIBAND_ADDR_TRANS | 37 | config INFINIBAND_ADDR_TRANS |
| 33 | bool | 38 | bool |
| 34 | depends on INFINIBAND && INET | 39 | depends on INFINIBAND && INET |
| @@ -40,6 +45,8 @@ source "drivers/infiniband/hw/ehca/Kconfig" | |||
| 40 | source "drivers/infiniband/hw/amso1100/Kconfig" | 45 | source "drivers/infiniband/hw/amso1100/Kconfig" |
| 41 | source "drivers/infiniband/hw/cxgb3/Kconfig" | 46 | source "drivers/infiniband/hw/cxgb3/Kconfig" |
| 42 | 47 | ||
| 48 | source "drivers/infiniband/hw/mlx4/Kconfig" | ||
| 49 | |||
| 43 | source "drivers/infiniband/ulp/ipoib/Kconfig" | 50 | source "drivers/infiniband/ulp/ipoib/Kconfig" |
| 44 | 51 | ||
| 45 | source "drivers/infiniband/ulp/srp/Kconfig" | 52 | source "drivers/infiniband/ulp/srp/Kconfig" |