diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-05-16 00:02:32 +0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-05-17 00:17:08 +0400 |
| commit | 0e6ce5f168e3b600b88d7e1a08c5b85cbceec6cb (patch) | |
| tree | a9fb7bac610ec47083ef125d5d8694d2419dd7e9 /arch/arm/boot | |
| parent | 423b742bec02b6c8d4e060517ce05b4cd3fd91c1 (diff) | |
| parent | 9601e87388f4969a80b021a40215d24c4e78d5b3 (diff) | |
| download | linux-0e6ce5f168e3b600b88d7e1a08c5b85cbceec6cb.tar.xz | |
Merge branch 'renesas/board2' into next/boards
* renesas/board2:
ARM: shmobile: fix smp build
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/boot')
| -rw-r--r-- | arch/arm/boot/dts/sh73a0-kzm9g.dts | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/sh73a0-kzm9g.dts b/arch/arm/boot/dts/sh73a0-kzm9g.dts index ed1bae5a24f1..bcb911951978 100644 --- a/arch/arm/boot/dts/sh73a0-kzm9g.dts +++ b/arch/arm/boot/dts/sh73a0-kzm9g.dts @@ -13,7 +13,7 @@ / { model = "KZM-A9-GT"; - compatible = "renesas,kzm9g"; + compatible = "renesas,kzm9g", "renesas,sh73a0"; memory { device_type = "memory"; |