diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-10-12 06:35:23 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-10-12 06:37:32 -0400 |
| commit | 365d46dc9be9b3c833990a06f3994b1987eda578 (patch) | |
| tree | 9397d1304144a288411f2118707f44ff5e862fa6 /arch/arm/plat-omap/ocpi.c | |
| parent | 5dc64a3442b98eaa0e3730c35fcf00cf962a93e7 (diff) | |
| parent | fd048088306656824958e7783ffcee27e241b361 (diff) | |
Merge branch 'linus' into x86/xen
Conflicts:
arch/x86/kernel/cpu/common.c
arch/x86/kernel/process_64.c
arch/x86/xen/enlighten.c
Diffstat (limited to 'arch/arm/plat-omap/ocpi.c')
| -rw-r--r-- | arch/arm/plat-omap/ocpi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/plat-omap/ocpi.c b/arch/arm/plat-omap/ocpi.c index 8bdbf979a257..ebe0c73c8901 100644 --- a/arch/arm/plat-omap/ocpi.c +++ b/arch/arm/plat-omap/ocpi.c | |||
| @@ -31,8 +31,8 @@ | |||
| 31 | #include <linux/spinlock.h> | 31 | #include <linux/spinlock.h> |
| 32 | #include <linux/err.h> | 32 | #include <linux/err.h> |
| 33 | #include <linux/clk.h> | 33 | #include <linux/clk.h> |
| 34 | #include <linux/io.h> | ||
| 34 | 35 | ||
| 35 | #include <asm/io.h> | ||
| 36 | #include <mach/hardware.h> | 36 | #include <mach/hardware.h> |
| 37 | 37 | ||
| 38 | #define OCPI_BASE 0xfffec320 | 38 | #define OCPI_BASE 0xfffec320 |