diff options
author | Roland Dreier <rolandd@cisco.com> | 2010-03-01 23:52:31 -0800 |
---|---|---|
committer | Roland Dreier <rolandd@cisco.com> | 2010-03-01 23:52:31 -0800 |
commit | fe8875e5a41a36ef26072cf05731df5493ade0e1 (patch) | |
tree | 786c31c1e86f5287177210fb469c8ecae0bdd146 /drivers/infiniband/Kconfig | |
parent | f57721507ffeaf8785f7f17254651de4d8b45e09 (diff) | |
parent | a265e5587f078618c1f17c3a83da65046f18746f (diff) |
Merge branch 'misc' into for-next
Conflicts:
drivers/infiniband/core/uverbs_main.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 dd0db67bf8d7..975adce5f40c 100644 --- a/drivers/infiniband/Kconfig +++ b/drivers/infiniband/Kconfig @@ -20,6 +20,7 @@ config INFINIBAND_USER_MAD config INFINIBAND_USER_ACCESS tristate "InfiniBand userspace access (verbs and CM)" + select ANON_INODES ---help--- Userspace InfiniBand access support. This enables the kernel side of userspace verbs and the userspace |