diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-08-15 16:16:15 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-08-15 16:16:15 +0200 |
| commit | 1a10390708d675ebf1a2f5e169a5165626afbd88 (patch) | |
| tree | d9ee7d10abd65e580fb74152a501089f51174225 /arch/arm/mach-omap2/memory.c | |
| parent | 239bd83104ec6bcba90221d8b0973d2565142ef8 (diff) | |
| parent | b635acec48bcaa9183fcbf4e3955616b0d4119b5 (diff) | |
| download | talos-op-linux-1a10390708d675ebf1a2f5e169a5165626afbd88.tar.gz talos-op-linux-1a10390708d675ebf1a2f5e169a5165626afbd88.zip | |
Merge branch 'linus' into x86/cpu
Diffstat (limited to 'arch/arm/mach-omap2/memory.c')
| -rw-r--r-- | arch/arm/mach-omap2/memory.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-omap2/memory.c b/arch/arm/mach-omap2/memory.c index 73cadb2c75cf..6b49cc9cbdcb 100644 --- a/arch/arm/mach-omap2/memory.c +++ b/arch/arm/mach-omap2/memory.c @@ -24,9 +24,9 @@ #include <asm/io.h> -#include <asm/arch/common.h> -#include <asm/arch/clock.h> -#include <asm/arch/sram.h> +#include <mach/common.h> +#include <mach/clock.h> +#include <mach/sram.h> #include "prm.h" |
