diff options
| author | Olof Johansson <olof@lixom.net> | 2012-11-06 06:02:52 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-11-06 06:03:17 -0800 |
| commit | 94058fc593c7d309af112d3124ae0fbb6880d8ec (patch) | |
| tree | 9dc60e19ee52f2a133ef42451cf33ddade27e6fb /arch/arm/boot/dts/Makefile | |
| parent | 3d70f8c617a436c7146ecb81df2265b4626dfe89 (diff) | |
| parent | 631a7b5d958d2ef2c2333b105794c693642f0641 (diff) | |
| download | op-kernel-dev-94058fc593c7d309af112d3124ae0fbb6880d8ec.zip op-kernel-dev-94058fc593c7d309af112d3124ae0fbb6880d8ec.tar.gz | |
Merge branch 'boards' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/boards
Renesas board changes from Simon Horman:
* 'boards' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
ARM: shmobile: Remove G4EVM machine support
ARM: shmobile: Remove G3EVM machine support
ARM: mach-shmobile: Use DT_MACHINE for mackerel
ARM: shmobile: marzen: add HSPI support
ARM: shmobile: armadillo800eva: enable restart
ARM: shmobile: kzm9g: enable DMAEngine on SHDI0 and SDHI2
ARM: shmobile: kzm9g: enable three-axis digital accelerometer ADXL345
ARM: shmobile: kzm9g: enable magnetometer ak8975.
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/boot/dts/Makefile')
| -rw-r--r-- | arch/arm/boot/dts/Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index f37cf9f..a9d8a10 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -77,7 +77,8 @@ dtb-$(CONFIG_ARCH_PRIMA2) += prima2-evb.dtb dtb-$(CONFIG_ARCH_U8500) += snowball.dtb dtb-$(CONFIG_ARCH_SHMOBILE) += emev2-kzm9d.dtb \ r8a7740-armadillo800eva.dtb \ - sh73a0-kzm9g.dtb + sh73a0-kzm9g.dtb \ + sh7372-mackerel.dtb dtb-$(CONFIG_ARCH_SPEAR13XX) += spear1310-evb.dtb \ spear1340-evb.dtb dtb-$(CONFIG_ARCH_SPEAR3XX)+= spear300-evb.dtb \ |
