diff options
| author | Sebastien Jan <s-jan@ti.com> | 2011-09-23 13:31:19 -0400 |
|---|---|---|
| committer | Paolo Pisati <paolo.pisati@canonical.com> | 2012-08-17 04:19:21 -0400 |
| commit | 924c4a91e110f7e8649c0fd0b1e5793de9e3d3ac (patch) | |
| tree | 90f80064576ef6e5226e25134815ac4ca20a986c /arch/arm | |
| parent | 369bb0f389b27693a807702fad0691d1e24cd72c (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>
Diffstat (limited to 'arch/arm')
| -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 249f3a46f21..dff3e964e55 100644 --- a/arch/arm/mach-omap2/Makefile +++ b/arch/arm/mach-omap2/Makefile | |||
| @@ -276,7 +276,6 @@ obj-$(CONFIG_ARCH_OMAP4) += hwspinlocks.o | |||
| 276 | 276 | ||
| 277 | smsc911x-$(CONFIG_SMSC911X) := gpmc-smsc911x.o | 277 | smsc911x-$(CONFIG_SMSC911X) := gpmc-smsc911x.o |
| 278 | obj-y += $(smsc911x-m) $(smsc911x-y) | 278 | obj-y += $(smsc911x-m) $(smsc911x-y) |
| 279 | obj-$(CONFIG_ARCH_OMAP4) += hwspinlock.o | ||
| 280 | 279 | ||
| 281 | disp-$(CONFIG_OMAP2_DSS) := display.o | 280 | disp-$(CONFIG_OMAP2_DSS) := display.o |
| 282 | obj-y += $(disp-m) $(disp-y) | 281 | obj-y += $(disp-m) $(disp-y) |