diff options
| author | Rafael J. Wysocki <rjw@sisk.pl> | 2012-05-12 22:36:02 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rjw@sisk.pl> | 2012-05-12 22:36:02 +0200 |
| commit | a515be1ca7df947db0f6018a174f49507affcdbc (patch) | |
| tree | 8f5be875e2902bee701a6840ba1fbb19e8d0384a /arch/arm/mach-shmobile/Makefile | |
| parent | 9183857d503f915ee05abb6e03cea7253dcbace6 (diff) | |
| parent | fecf84c14fa755b0e30ba64a290db658a06c76fb (diff) | |
| download | blackbird-op-linux-a515be1ca7df947db0f6018a174f49507affcdbc.tar.gz blackbird-op-linux-a515be1ca7df947db0f6018a174f49507affcdbc.zip | |
Merge branch 'renesas-kzm9g' into renesas-board-new
* renesas-kzm9g:
ARM: mach-shmobile: kzm9g: enable SMP boot
ARM: mach-shmobile: kzm9g: defconfig update
ARM: mach-shmobile: kzm9g: add PCF8757 gpio-key
ARM: mach-shmobile: kzm9g: add SDHI support
ARM: mach-shmobile: kzm9g: add MMCIF support
ARM: mach-shmobile: kzm9g: correct screen direction
ARM: mach-shmobile: sh73a0.h: add GPIO_NR
ARM: mach-shmobile: pfc-sh73a0: fixup MSEL2CR MSEL18 for I2C-3
ARM: mach-shmobile: kzm9g: add ST1232 Touchscreen support
ARM: mach-shmobile: kzm9g: add LCDC support
ARM: mach-shmobile: kzm9g: add external USB Host support
ARM: mach-shmobile: kzm9g: add SMSC 9221 support
ARM: mach-shmobile: kzm9g: add defconfig
ARM: mach-shmobile: add KZM-A9-GT board support
Conflicts:
arch/arm/mach-shmobile/Makefile
Diffstat (limited to 'arch/arm/mach-shmobile/Makefile')
| -rw-r--r-- | arch/arm/mach-shmobile/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-shmobile/Makefile b/arch/arm/mach-shmobile/Makefile index 6125c2b4d523..4ac8c12c72ba 100644 --- a/arch/arm/mach-shmobile/Makefile +++ b/arch/arm/mach-shmobile/Makefile @@ -50,6 +50,7 @@ obj-$(CONFIG_MACH_KOTA2) += board-kota2.o obj-$(CONFIG_MACH_BONITO) += board-bonito.o obj-$(CONFIG_MACH_MARZEN) += board-marzen.o obj-$(CONFIG_MACH_ARMADILLO800EVA) += board-armadillo800eva.o +obj-$(CONFIG_MACH_KZM9G) += board-kzm9g.o # Framework support obj-$(CONFIG_SMP) += $(smp-y) |
