renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-18 02:04:05 +08:00
Code

Merge branch 'renesas/board2' into next/boards

Browse Source 
* renesas/board2:
  ARM: shmobile: fix smp build

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann 2012-05-15 22:02:32 +02:00
commit 0e6ce5f168
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/boot/dts/sh73a0-kzm9g.dts
View File

@ -13,7 +13,7 @@
/ {
model = "KZM-A9-GT";
compatible = "renesas,kzm9g";
compatible = "renesas,kzm9g", "renesas,sh73a0";
memory {
device_type = "memory";

4
arch/arm/mach-shmobile/platsmp.c
View File

@ -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)