diff options
| author | Steve French <sfrench@us.ibm.com> | 2008-02-06 11:04:00 -0500 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2008-02-06 11:04:00 -0500 |
| commit | f315ccb3e679f271583f2a4f463ad9b65665b751 (patch) | |
| tree | 44eb52102587d7b0bb592464cef6ec04bcac8b90 /drivers/infiniband/Makefile | |
| parent | ead03e30b050d6dda769e7e9b071c5fa720bf8d2 (diff) | |
| parent | 551e4fb2465b87de9d4aa1669b27d624435443bb (diff) | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/infiniband/Makefile')
| -rw-r--r-- | drivers/infiniband/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/infiniband/Makefile b/drivers/infiniband/Makefile index 75f325e40b54..ed35e4496241 100644 --- a/drivers/infiniband/Makefile +++ b/drivers/infiniband/Makefile | |||
| @@ -5,6 +5,7 @@ obj-$(CONFIG_INFINIBAND_EHCA) += hw/ehca/ | |||
| 5 | obj-$(CONFIG_INFINIBAND_AMSO1100) += hw/amso1100/ | 5 | obj-$(CONFIG_INFINIBAND_AMSO1100) += hw/amso1100/ |
| 6 | obj-$(CONFIG_INFINIBAND_CXGB3) += hw/cxgb3/ | 6 | obj-$(CONFIG_INFINIBAND_CXGB3) += hw/cxgb3/ |
| 7 | obj-$(CONFIG_MLX4_INFINIBAND) += hw/mlx4/ | 7 | obj-$(CONFIG_MLX4_INFINIBAND) += hw/mlx4/ |
| 8 | obj-$(CONFIG_INFINIBAND_NES) += hw/nes/ | ||
| 8 | obj-$(CONFIG_INFINIBAND_IPOIB) += ulp/ipoib/ | 9 | obj-$(CONFIG_INFINIBAND_IPOIB) += ulp/ipoib/ |
| 9 | obj-$(CONFIG_INFINIBAND_SRP) += ulp/srp/ | 10 | obj-$(CONFIG_INFINIBAND_SRP) += ulp/srp/ |
| 10 | obj-$(CONFIG_INFINIBAND_ISER) += ulp/iser/ | 11 | obj-$(CONFIG_INFINIBAND_ISER) += ulp/iser/ |