summaryrefslogtreecommitdiff
path: root/drivers/bus/Makefile
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2012-10-01 14:33:55 -0700
committerOlof Johansson <olof@lixom.net>2012-10-01 14:33:55 -0700
commit8b1a13b02812b60b88920801363920956691feb3 (patch)
treecf140e1dfd5754aef0a59003cf9266aad003b8f5 /drivers/bus/Makefile
parent5c008d7029fcd12a9a54fa618781b71353f6c4bd (diff)
parent04ef037c926ddb31088c976538e29eada4fd1490 (diff)
downloadlwn-8b1a13b02812b60b88920801363920956691feb3.tar.gz
lwn-8b1a13b02812b60b88920801363920956691feb3.zip
Merge branch 'next/drivers' into HEAD
Conflicts: arch/arm/boot/dts/omap4.dtsi arch/arm/mach-clps711x/common.c arch/arm/mach-omap1/board-h2.c arch/arm/mach-omap1/board-h3.c arch/arm/mach-omap1/leds-h2p2-debug.c arch/arm/mach-omap1/leds.c arch/arm/mach-pnx4008/time.c arch/arm/plat-omap/debug-leds.c drivers/Makefile drivers/bus/omap_l3_noc.c
Diffstat (limited to 'drivers/bus/Makefile')
-rw-r--r--drivers/bus/Makefile8
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/bus/Makefile b/drivers/bus/Makefile
new file mode 100644
index 000000000000..45d997c85453
--- /dev/null
+++ b/drivers/bus/Makefile
@@ -0,0 +1,8 @@
+#
+# Makefile for the bus drivers.
+#
+
+obj-$(CONFIG_OMAP_OCP2SCP) += omap-ocp2scp.o
+
+# Interconnect bus driver for OMAP SoCs.
+obj-$(CONFIG_OMAP_INTERCONNECT) += omap_l3_smx.o omap_l3_noc.o