diff options
| author | Arnd Bergmann | 2012-05-14 15:33:42 +0200 |
|---|---|---|
| committer | Arnd Bergmann | 2012-05-14 15:33:42 +0200 |
| commit | d2819f80d465672b09c2f4cb52303b7f951c4d0f (patch) | |
| tree | aa0262703e86b97ad1460c722e78d7233e24e3bb /arch/arm/plat-spear/Makefile | |
| parent | SPEAr: Switch to common clock framework (diff) | |
| parent | Merge branches 'depends/pinctrl/devel' and 'depends/rmk/clkdev' into spear/pi... (diff) | |
| download | kernel-qcow2-linux-d2819f80d465672b09c2f4cb52303b7f951c4d0f.tar.gz kernel-qcow2-linux-d2819f80d465672b09c2f4cb52303b7f951c4d0f.tar.xz kernel-qcow2-linux-d2819f80d465672b09c2f4cb52303b7f951c4d0f.zip | |
Merge branch 'spear/pinctrl' into spear/clock
Conflicts:
arch/arm/mach-spear3xx/Makefile
arch/arm/mach-spear3xx/clock.c
arch/arm/mach-spear3xx/include/mach/generic.h
arch/arm/mach-spear6xx/clock.c
arch/arm/plat-spear/Makefile
drivers/pinctrl/core.c
This resolves some annoying merge conflicts.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/plat-spear/Makefile')
| -rw-r--r-- | arch/arm/plat-spear/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/plat-spear/Makefile b/arch/arm/plat-spear/Makefile index 8c0cb6a965a3..38f1235f4632 100644 --- a/arch/arm/plat-spear/Makefile +++ b/arch/arm/plat-spear/Makefile @@ -3,6 +3,6 @@ # # Common support -obj-y := restart.o time.o +obj-y := restart.o time.o pl080.o -obj-$(CONFIG_ARCH_SPEAR3XX) += shirq.o padmux.o +obj-$(CONFIG_ARCH_SPEAR3XX) += shirq.o |