git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
USB: serial: sierra driver performance improvements
[safe/jmp/linux-2.6]
/
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
config INFINIBAND_ADDR_TRANS
bool
depends on INET
+ depends on !(INFINIBAND = y && IPV6 = m)
default y
source "drivers/infiniband/hw/mthca/Kconfig"
default y
source "drivers/infiniband/hw/mthca/Kconfig"