Merge branch 'linus' into x86/urgent

[linux-2.6] / drivers / infiniband / ulp / ipoib / Kconfig

diff --git a/drivers/infiniband/ulp/ipoib/Kconfig b/drivers/infiniband/ulp/ipoib/Kconfig
index af78ccc4ce7108aba6968b5438a0d8adbc7be4f2..691525cf394a34f4b2e4f68bf9ee5ee0f6b1cb85 100644 (file)
--- a/drivers/infiniband/ulp/ipoib/Kconfig
+++ b/drivers/infiniband/ulp/ipoib/Kconfig
@@ -1,6 +1,7 @@
 config INFINIBAND_IPOIB
        tristate "IP-over-InfiniBand"
-       depends on INFINIBAND && NETDEVICES && INET && (IPV6 || IPV6=n)
+       depends on NETDEVICES && INET && (IPV6 || IPV6=n)
+       select INET_LRO
        ---help---
          Support for the IP-over-InfiniBand protocol (IPoIB). This
          transports IP packets over InfiniBand so you can use your IB