diff options
| author | David Vrabel <david.vrabel@citrix.com> | 2014-04-28 10:31:04 +0100 |
|---|---|---|
| committer | David Vrabel <david.vrabel@citrix.com> | 2014-04-28 10:31:04 +0100 |
| commit | 67dadcb324c2fe059cb2c35f8b80df42bb23f7c4 (patch) | |
| tree | 3521a2a9e05a7de426ab50bc7685489ad6340e54 /arch/arm/mach-gemini/idle.c | |
| parent | eb47f71200b7d5b4c8c1f8c75675f592d855aafd (diff) | |
| parent | e26a9e00afc482b971afcaef1db8c9034d4d6d7c (diff) | |
Merge commit 'e26a9e0' into stable/for-linus-3.15
Diffstat (limited to 'arch/arm/mach-gemini/idle.c')
| -rw-r--r-- | arch/arm/mach-gemini/idle.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-gemini/idle.c b/arch/arm/mach-gemini/idle.c index 87dff4f5059e..ddf8ec9d203b 100644 --- a/arch/arm/mach-gemini/idle.c +++ b/arch/arm/mach-gemini/idle.c @@ -3,7 +3,7 @@ */ #include <linux/init.h> -#include <asm/system.h> +#include <asm/system_misc.h> #include <asm/proc-fns.h> static void gemini_idle(void) |