Merge ../linus

[sfrench/cifs-2.6.git] / drivers / infiniband / Kconfig

diff --git a/drivers/infiniband/Kconfig b/drivers/infiniband/Kconfig
index 325d502e25cdb30df585ecb68a642ac9aeb5818b..afc612b8577dc6c6f673fb5d2913031256c49877 100644 (file)
--- a/drivers/infiniband/Kconfig
+++ b/drivers/infiniband/Kconfig
@@ -30,7 +30,10 @@ config INFINIBAND_USER_ACCESS
          <http://www.openib.org>.
 
 source "drivers/infiniband/hw/mthca/Kconfig"
+source "drivers/infiniband/hw/ipath/Kconfig"
 
 source "drivers/infiniband/ulp/ipoib/Kconfig"
 
+source "drivers/infiniband/ulp/srp/Kconfig"
+
 endmenu