git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'drm-vmware-staging' of git://git.kernel.org/pub/scm/linux/kernel/git...
[pandora-kernel.git]
/
drivers
/
infiniband
/
Kconfig
diff --git
a/drivers/infiniband/Kconfig
b/drivers/infiniband/Kconfig
index
a5dc78a
..
dd0db67
100644
(file)
--- a/
drivers/infiniband/Kconfig
+++ b/
drivers/infiniband/Kconfig
@@
-37,6
+37,7
@@
config INFINIBAND_USER_MEM
config INFINIBAND_ADDR_TRANS
bool
depends on INET
+ depends on !(INFINIBAND = y && IPV6 = m)
default y
source "drivers/infiniband/hw/mthca/Kconfig"