Messages in this thread | | | Date | Fri, 30 Mar 2012 11:46:46 +1100 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the acpi tree with Linus' tree |
| |
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 necessary. -- Cheers, Stephen Rothwell sfr@canb.auug.org.au
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) [unhandled content-type:application/pgp-signature] | |