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 | |
| 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')
| -rw-r--r-- | arch/arm/boot/dts/sh73a0-kzm9g.dts | 2 | ||||
| -rw-r--r-- | arch/arm/mach-shmobile/platsmp.c | 4 |
2 files changed, 4 insertions, 2 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"; diff --git a/arch/arm/mach-shmobile/platsmp.c b/arch/arm/mach-shmobile/platsmp.c index d959f07d1ef0..5a2b69cf5ba6 100644 --- a/arch/arm/mach-shmobile/platsmp.c +++ b/arch/arm/mach-shmobile/platsmp.c @@ -16,11 +16,13 @@ #include <linux/device.h> #include <linux/smp.h> #include <linux/io.h> +#include <linux/of.h> #include <asm/hardware/gic.h> #include <asm/mach-types.h> #include <mach/common.h> -#define is_sh73a0() (machine_is_ag5evm() || machine_is_kota2() || machine_is_kzm9g()) +#define is_sh73a0() (machine_is_ag5evm() || machine_is_kota2() || \ + of_machine_is_compatible("renesas,sh73a0")) #define is_r8a7779() machine_is_marzen() static unsigned int __init shmobile_smp_get_core_count(void) |