Manual merge with Linus (conflict in drivers/input/misc/wistron_bnts.c)
[linux-2.6] / drivers / infiniband / Makefile
1 obj-$(CONFIG_INFINIBAND)                += core/
2 obj-$(CONFIG_INFINIBAND_MTHCA)          += hw/mthca/
3 obj-$(CONFIG_INFINIBAND_IPOIB)          += ulp/ipoib/
4 obj-$(CONFIG_INFINIBAND_SRP)            += ulp/srp/