diff options
| author | Arnd Bergmann | 2012-05-14 15:59:18 +0200 |
|---|---|---|
| committer | Arnd Bergmann | 2012-05-14 17:35:50 +0200 |
| commit | 090a80cba39f2763a488b6f7c65e38922d5aa17a (patch) | |
| tree | ba3797eeca74c42be95bc592ed2db1be99e329d2 /arch/arm/plat-spear/Makefile | |
| parent | Linux 3.4-rc7 (diff) | |
| parent | pinctrl: SPEAr1310: Fix pin numbers for clcd_high_res (diff) | |
| download | kernel-qcow2-linux-090a80cba39f2763a488b6f7c65e38922d5aa17a.tar.gz kernel-qcow2-linux-090a80cba39f2763a488b6f7c65e38922d5aa17a.tar.xz kernel-qcow2-linux-090a80cba39f2763a488b6f7c65e38922d5aa17a.zip | |
Merge branch 'spear/13xx' into next/soc2
* spear/13xx:
pinctrl: SPEAr1310: Fix pin numbers for clcd_high_res
SPEAr: Update MAINTAINERS and Documentation
SPEAr13xx: Add defconfig
SPEAr13xx: Add compilation support
SPEAr13xx: Add dts and dtsi files
pinctrl: Add SPEAr13xx pinctrl drivers
pinctrl: SPEAr: Create macro for declaring GPIO PINS
SPEAr13xx: Add common clock framework support
SPEAr13xx: Add source files
SPEAr13xx: Add header files
Depends on clock, pinctrl and dt branches to go first.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/plat-spear/Makefile')
| -rw-r--r-- | arch/arm/plat-spear/Makefile | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/plat-spear/Makefile b/arch/arm/plat-spear/Makefile index e0f2e5b9530c..2607bd05c525 100644 --- a/arch/arm/plat-spear/Makefile +++ b/arch/arm/plat-spear/Makefile @@ -3,6 +3,7 @@ # # Common support -obj-y := clock.o restart.o time.o +obj-y := restart.o time.o -obj-$(CONFIG_ARCH_SPEAR3XX) += shirq.o padmux.o +obj-$(CONFIG_ARCH_SPEAR3XX) += pl080.o shirq.o +obj-$(CONFIG_ARCH_SPEAR6XX) += pl080.o |