diff options
| author |   Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-07-04 13:13:55 -0700 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-07-04 13:13:55 -0700 |
| commit | 404c3bc30cb1361e1b3533643326ab472d24a618 (patch) | |
| tree | 156cc9032c8aee17167d926c5bdae009ba8f36d2 /drivers/infiniband/Kconfig | |
| parent | Input: wacom - TPC2FG doesn't store touch id for slots (diff) | |
| parent | Linux 3.5-rc5 (diff) | |
| download | linux-dev-404c3bc30cb1361e1b3533643326ab472d24a618.tar.xz linux-dev-404c3bc30cb1361e1b3533643326ab472d24a618.zip | |
Merge commit 'v3.5-rc5' into next
Diffstat (limited to 'drivers/infiniband/Kconfig')
| -rw-r--r-- | drivers/infiniband/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/infiniband/Kconfig b/drivers/infiniband/Kconfig index eb0add311dc8..a0f29c1d03bc 100644 --- a/drivers/infiniband/Kconfig +++ b/drivers/infiniband/Kconfig @@ -51,6 +51,7 @@ source "drivers/infiniband/hw/cxgb3/Kconfig" source "drivers/infiniband/hw/cxgb4/Kconfig" source "drivers/infiniband/hw/mlx4/Kconfig" source "drivers/infiniband/hw/nes/Kconfig" +source "drivers/infiniband/hw/ocrdma/Kconfig" source "drivers/infiniband/ulp/ipoib/Kconfig" |