Manual merge with Linus (conflict in drivers/input/misc/wistron_bnts.c)
[linux-2.6] / drivers / infiniband / ulp / srp / Kbuild
1 obj-$(CONFIG_INFINIBAND_SRP)                    += ib_srp.o