diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-11-01 21:46:10 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-11-01 21:46:10 -0400 |
| commit | 884897e6a10a86de0e611a76f4bf3fd0068a672c (patch) | |
| tree | 019689fb9d129404af1efba4df10975bc9e0a57a /arch/arm/Makefile | |
| parent | c72dbae971400e466ad9ff16c920cd6d9d8c55a1 (diff) | |
| parent | 8b61f37440388ebbd2a894178fe098f2e70ab392 (diff) | |
Merge branch 'highbank/soc' into next/soc
Conflicts:
arch/arm/mach-mxs/include/mach/gpio.h
arch/arm/mach-omap2/board-generic.c
arch/arm/plat-mxc/include/mach/gpio.h
Diffstat (limited to 'arch/arm/Makefile')
| -rw-r--r-- | arch/arm/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/Makefile b/arch/arm/Makefile index 8904caa736cb..e8688114ca95 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile | |||
| @@ -144,6 +144,7 @@ machine-$(CONFIG_ARCH_EBSA110) := ebsa110 | |||
| 144 | machine-$(CONFIG_ARCH_EP93XX) := ep93xx | 144 | machine-$(CONFIG_ARCH_EP93XX) := ep93xx |
| 145 | machine-$(CONFIG_ARCH_GEMINI) := gemini | 145 | machine-$(CONFIG_ARCH_GEMINI) := gemini |
| 146 | machine-$(CONFIG_ARCH_H720X) := h720x | 146 | machine-$(CONFIG_ARCH_H720X) := h720x |
| 147 | machine-$(CONFIG_ARCH_HIGHBANK) := highbank | ||
| 147 | machine-$(CONFIG_ARCH_INTEGRATOR) := integrator | 148 | machine-$(CONFIG_ARCH_INTEGRATOR) := integrator |
| 148 | machine-$(CONFIG_ARCH_IOP13XX) := iop13xx | 149 | machine-$(CONFIG_ARCH_IOP13XX) := iop13xx |
| 149 | machine-$(CONFIG_ARCH_IOP32X) := iop32x | 150 | machine-$(CONFIG_ARCH_IOP32X) := iop32x |