diff options
| author | Arnd Bergmann | 2012-03-20 23:42:24 +0100 |
|---|---|---|
| committer | Arnd Bergmann | 2012-03-20 23:42:24 +0100 |
| commit | f907ab06bb021bcb91d39c8d1b36536ebdb318fa (patch) | |
| tree | 6020618997a6ea1b5f5b59c89df35344023f7c82 /arch/arm/mach-omap2/Makefile | |
| parent | Merge branch 'imx/defconfig' into next/drivers (diff) | |
| parent | Merge branch 'fixes' into next/fixes-non-critical (diff) | |
| download | kernel-qcow2-linux-f907ab06bb021bcb91d39c8d1b36536ebdb318fa.tar.gz kernel-qcow2-linux-f907ab06bb021bcb91d39c8d1b36536ebdb318fa.tar.xz kernel-qcow2-linux-f907ab06bb021bcb91d39c8d1b36536ebdb318fa.zip | |
Merge branch 'next/fixes-non-critical' into next/drivers
Conflicts:
arch/arm/mach-lpc32xx/clock.c
arch/arm/mach-pxa/pxa25x.c
arch/arm/mach-pxa/pxa27x.c
The conflicts with pxa are non-obvious, we have multiple branches
adding and removing the same clock settings. According to
Haojian Zhuang, removing the sa1100 rtc dummy clock is the correct
fix here.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-omap2/Makefile')
| -rw-r--r-- | arch/arm/mach-omap2/Makefile | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile index 56a6e98652cc..f1096172b9bb 100644 --- a/arch/arm/mach-omap2/Makefile +++ b/arch/arm/mach-omap2/Makefile @@ -265,6 +265,8 @@ obj-y += $(smc91x-m) $(smc91x-y) smsc911x-$(CONFIG_SMSC911X) := gpmc-smsc911x.o obj-y += $(smsc911x-m) $(smsc911x-y) -obj-$(CONFIG_ARCH_OMAP4) += hwspinlock.o +ifneq ($(CONFIG_HWSPINLOCK_OMAP),) +obj-y += hwspinlock.o +endif obj-y += common-board-devices.o twl-common.o |