summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastien Jan <s-jan@ti.com>2011-12-16 13:05:25 +0800
committerAndy Green <andy.green@linaro.org>2012-01-09 08:39:26 +0800
commite6fdd13a42c72d35ed1ed80ff0eaa3f4c1e7b245 (patch)
tree471b9357a1d7eec8d51c7fc8cbbb0ff95a22b9ae
parentfcfea40a2916d4da917976d06119b5293b2218b4 (diff)
hwspinlock: deactivate upstream implementation
Upstream hwspinlocks implementation conflicts with legacy one. For now, deactivate the upstream version and use the legacy one. Signed-off-by: Sebastien Jan <s-jan@ti.com>
-rw-r--r--arch/arm/mach-omap2/Makefile1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile
index 4c8378e43c0..0b82998188a 100644
--- a/arch/arm/mach-omap2/Makefile
+++ b/arch/arm/mach-omap2/Makefile
@@ -284,6 +284,5 @@ obj-$(CONFIG_ARCH_OMAP4) += hwspinlocks.o
smsc911x-$(CONFIG_SMSC911X) := gpmc-smsc911x.o
obj-y += $(smsc911x-m) $(smsc911x-y)
-obj-$(CONFIG_ARCH_OMAP4) += hwspinlock.o
obj-y += common-board-devices.o twl-common.o