diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-10-17 12:25:43 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-10-17 12:25:43 +0200 |
| commit | 0f1f6dec9593c8319714c927dafb443548a1452a (patch) | |
| tree | 74f887dc86747523e82f08900501073f451996cc /arch/arm/mach-omap2/pm.c | |
| parent | 8cd162ce230b154e564a1285bb5f89fcf73f0dce (diff) | |
| parent | 2e532d68a2b3e2aa6b19731501222069735c741c (diff) | |
Merge branch 'linus' into sched/urgent
Diffstat (limited to 'arch/arm/mach-omap2/pm.c')
| -rw-r--r-- | arch/arm/mach-omap2/pm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/pm.c b/arch/arm/mach-omap2/pm.c index 8671e1079ab..55361c16c9d 100644 --- a/arch/arm/mach-omap2/pm.c +++ b/arch/arm/mach-omap2/pm.c @@ -24,8 +24,8 @@ #include <linux/module.h> #include <linux/delay.h> #include <linux/clk.h> +#include <linux/io.h> -#include <asm/io.h> #include <asm/irq.h> #include <asm/atomic.h> #include <asm/mach/time.h> |