diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-09-22 13:08:57 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-09-22 13:08:57 +0200 |
| commit | 0b88641f1bafdbd087d5e63987a30cc0eadd63b9 (patch) | |
| tree | 81dcf756db373444140bb2623584710c628e3048 /arch/arm/mach-omap2/sram243x.S | |
| parent | fbdbf709938d155c719c76b9894d28342632c797 (diff) | |
| parent | 72d31053f62c4bc464c2783974926969614a8649 (diff) | |
Merge commit 'v2.6.27-rc7' into x86/debug
Diffstat (limited to 'arch/arm/mach-omap2/sram243x.S')
| -rw-r--r-- | arch/arm/mach-omap2/sram243x.S | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/sram243x.S b/arch/arm/mach-omap2/sram243x.S index a3fa48dc08c..84363e269e8 100644 --- a/arch/arm/mach-omap2/sram243x.S +++ b/arch/arm/mach-omap2/sram243x.S @@ -24,8 +24,8 @@ */ #include <linux/linkage.h> #include <asm/assembler.h> -#include <asm/arch/io.h> -#include <asm/hardware.h> +#include <mach/io.h> +#include <mach/hardware.h> #include "prm.h" #include "cm.h" |