summaryrefslogtreecommitdiff
path: root/drivers/vbus/Makefile
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2010-05-27 14:45:03 +1000
committerStephen Rothwell <sfr@canb.auug.org.au>2010-05-27 14:45:03 +1000
commitfd64f7cb0b0326493f43de171af70736e8af1a3d (patch)
tree85eebe8b9c077afdc2d775a0ffb09137de23e3e7 /drivers/vbus/Makefile
parent764cefbbf25bab197b422c87e215423228d78530 (diff)
parent17d1061f5d87eff7d50942399414845d1f7a8a08 (diff)
Merge remote branch 'alacrity/linux-next'
Diffstat (limited to 'drivers/vbus/Makefile')
-rw-r--r--drivers/vbus/Makefile6
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/vbus/Makefile b/drivers/vbus/Makefile
new file mode 100644
index 000000000000..944b7f1fec90
--- /dev/null
+++ b/drivers/vbus/Makefile
@@ -0,0 +1,6 @@
+
+vbus-proxy-objs += bus-proxy.o
+obj-$(CONFIG_VBUS_PROXY) += vbus-proxy.o
+
+vbus-pcibridge-objs += pci-bridge.o
+obj-$(CONFIG_VBUS_PCIBRIDGE) += vbus-pcibridge.o