diff options
| author | Sebastien Jan <s-jan@ti.com> | 2011-10-25 10:51:49 +0800 |
|---|---|---|
| committer | Andy Green <andy.green@linaro.org> | 2011-10-25 10:51:49 +0800 |
| commit | 95a0a66cb41df2fad27f94fd1fe05c413b187889 (patch) | |
| tree | a445b1ed93b2a32738b477d4a753c039c918d33f | |
| parent | d6a3cdaa31fe859c539d4ba02f6366dcf96fd172 (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/Makefile | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile index 9dcae9dde7c..95e0d8d6d66 100644 --- a/arch/arm/mach-omap2/Makefile +++ b/arch/arm/mach-omap2/Makefile @@ -293,7 +293,6 @@ obj-$(CONFIG_ARCH_OMAP4) += hwspinlocks.o smsc911x-$(CONFIG_SMSC911X) := gpmc-smsc911x.o obj-y += $(smsc911x-m) $(smsc911x-y) -obj-$(CONFIG_ARCH_OMAP4) += hwspinlock.o disp-$(CONFIG_OMAP2_DSS) := display.o obj-y += $(disp-m) $(disp-y) |