diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-04-09 06:53:45 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-04-09 06:53:45 -0400 |
| commit | 1eecb8280b038019f2f914abc01b28caf5d0a168 (patch) | |
| tree | 7efa7cfc60b64ce50d437342d6457211effbb0ea /arch/sh/kernel/idle.c | |
| parent | c2f6702d318e43bf841da9c0ba5b6f1695661bbc (diff) | |
| parent | 0034102808e0dbbf3a2394b82b1bb40b5778de9e (diff) | |
Merge tag 'v3.4-rc2' into for-3.5
Linux 3.4-rc2 contains some bug fixes we need, including the addition of
an export for regcache_sync_region().
Diffstat (limited to 'arch/sh/kernel/idle.c')
| -rw-r--r-- | arch/sh/kernel/idle.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sh/kernel/idle.c b/arch/sh/kernel/idle.c index 64852ecc6881..ee226e20c20c 100644 --- a/arch/sh/kernel/idle.c +++ b/arch/sh/kernel/idle.c | |||
| @@ -17,8 +17,8 @@ | |||
| 17 | #include <linux/irqflags.h> | 17 | #include <linux/irqflags.h> |
| 18 | #include <linux/smp.h> | 18 | #include <linux/smp.h> |
| 19 | #include <linux/cpuidle.h> | 19 | #include <linux/cpuidle.h> |
| 20 | #include <asm/pgalloc.h> | ||
| 21 | #include <linux/atomic.h> | 20 | #include <linux/atomic.h> |
| 21 | #include <asm/pgalloc.h> | ||
| 22 | #include <asm/smp.h> | 22 | #include <asm/smp.h> |
| 23 | #include <asm/bl_bit.h> | 23 | #include <asm/bl_bit.h> |
| 24 | 24 | ||