From 7b2493ccf10e4a4eabc897020a35e3c25d07bd3e Mon Sep 17 00:00:00 2001 From: Arnd Bergmann Date: Sun, 23 Sep 2012 22:41:21 +0000 Subject: [PATCH] --- yaml --- r: 326687 b: refs/heads/master c: 28901c1fed11dfeab65f640878e85a9b61d311ed h: refs/heads/master i: 326685: bc6c4016a830224955aec30b85b17b672815dd65 326683: b2f0aa60b1009f5f23897693d1bb468bf56092cc 326679: cc3eaa512423713bb5b5a7ee15c43bdfff4690d3 326671: d7ec195d4a8fcdebf643f1f609e732c00dc5b2d3 326655: 4e221374f2bff633168a9e3b57d55f9afbf445df v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-shmobile/board-kzm9g.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index a4b234256686..081efb0d22a6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8f91465d5e18bc34c06720527c630deb88201692 +refs/heads/master: 28901c1fed11dfeab65f640878e85a9b61d311ed diff --git a/trunk/arch/arm/mach-shmobile/board-kzm9g.c b/trunk/arch/arm/mach-shmobile/board-kzm9g.c index fd21fb6f9953..5d792e475306 100644 --- a/trunk/arch/arm/mach-shmobile/board-kzm9g.c +++ b/trunk/arch/arm/mach-shmobile/board-kzm9g.c @@ -765,7 +765,7 @@ static void __init kzm_init(void) static void kzm9g_restart(char mode, const char *cmd) { -#define RESCNT2 0xe6188020 +#define RESCNT2 IOMEM(0xe6188020) /* Do soft power on reset */ writel((1 << 31), RESCNT2); }