linux-next: manual merge of the acpi tree with Linus' tree

From: Stephen Rothwell
Date: Thu Mar 29 2012 - 20:47:01 EST

Hi Len,

Today's linux-next merge of the acpi tree got a conflict in
arch/arm/mach-shmobile/cpuidle.c between commit 9f97da78bf01
("Disintegrate asm/system.h for ARM") from Linus' tree and commit
ee807dd89c00 ("ARM: shmobile: Consolidate time keeping and irq enable")
from the acpi tree.

Just context changes. I fixed it up (see below) and can carry the fix as
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx

diff --cc arch/arm/mach-shmobile/cpuidle.c
index 21b09b6,ca23b20..0000000
--- a/arch/arm/mach-shmobile/cpuidle.c
+++ b/arch/arm/mach-shmobile/cpuidle.c
@@@ -13,6 -13,8 +13,7 @@@
#include <linux/suspend.h>
#include <linux/module.h>
#include <linux/err.h>
-#include <asm/system.h>
+ #include <asm/cpuidle.h>
#include <asm/io.h>

static void shmobile_enter_wfi(void)

Attachment: pgp00000.pgp
Description: PGP signature