diff options
author | Arnd Bergmann <arnd@arndb.de> | 2011-11-02 02:46:55 +0100 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2011-11-02 02:46:55 +0100 |
commit | abc3f126ac736280c68db6472eb0040ddf6e1b1f (patch) | |
tree | 4e3333cde6da6c49dcd81920410bf5a33055f03a /arch/arm/plat-mxc/Makefile | |
parent | b8df0ea26ac17c9a073f235c7fdfbdd1851b59ea (diff) | |
parent | 8bcb97659656042f3132b2814b19709856aa1335 (diff) |
Merge branch 'imx/imx6q' into next/soc
Conflicts:
Documentation/devicetree/bindings/arm/fsl.txt
arch/arm/Kconfig
arch/arm/Kconfig.debug
arch/arm/plat-mxc/include/mach/common.h
Diffstat (limited to 'arch/arm/plat-mxc/Makefile')
-rw-r--r-- | arch/arm/plat-mxc/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/plat-mxc/Makefile b/arch/arm/plat-mxc/Makefile index d53c35fe2ea..b9f0f5f499a 100644 --- a/arch/arm/plat-mxc/Makefile +++ b/arch/arm/plat-mxc/Makefile @@ -5,7 +5,7 @@ # Common support obj-y := clock.o time.o devices.o cpu.o system.o irq-common.o -# MX51 uses the TZIC interrupt controller, older platforms use AVIC +obj-$(CONFIG_ARM_GIC) += gic.o obj-$(CONFIG_MXC_TZIC) += tzic.o obj-$(CONFIG_MXC_AVIC) += avic.o |