Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6

[linux-2.6-omap-h63xx.git] / drivers / infiniband / hw / ehca / Kconfig

diff --git a/drivers/infiniband/hw/ehca/Kconfig b/drivers/infiniband/hw/ehca/Kconfig
index 922389b643940f8d9dd11faae23ed82cf5714fd6..59f807d8d58e5eb043fad41b7182bca53bac8cc5 100644 (file)
--- a/drivers/infiniband/hw/ehca/Kconfig
+++ b/drivers/infiniband/hw/ehca/Kconfig
@@ -1,16 +1,9 @@
 config INFINIBAND_EHCA
        tristate "eHCA support"
-       depends on IBMEBUS && INFINIBAND
+       depends on IBMEBUS
        ---help---
        This driver supports the IBM pSeries eHCA InfiniBand adapter.
 
        To compile the driver as a module, choose M here. The module
        will be called ib_ehca.
 
-config INFINIBAND_EHCA_SCALING
-       bool "Scaling support (EXPERIMENTAL)"
-       depends on IBMEBUS && INFINIBAND_EHCA && HOTPLUG_CPU && EXPERIMENTAL
-       ---help---
-       eHCA scaling support schedules the CQ callbacks to different CPUs.
-
-       To enable this feature choose Y here.