diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-09-24 04:31:34 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-09-24 04:31:34 -0400 |
| commit | e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30 (patch) | |
| tree | 77926550ac0c31b1423bcf193a4ed0ecb7fda2c1 /arch/arm/mach-orion5x/mpp.c | |
| parent | d4738792fb86600b6cb7220459d9c47e819b3580 (diff) | |
| parent | 72d31053f62c4bc464c2783974926969614a8649 (diff) | |
Merge commit 'v2.6.27-rc7' into x86/microcode
Diffstat (limited to 'arch/arm/mach-orion5x/mpp.c')
| -rw-r--r-- | arch/arm/mach-orion5x/mpp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-orion5x/mpp.c b/arch/arm/mach-orion5x/mpp.c index a48cadb01590..c04ab0e16ea1 100644 --- a/arch/arm/mach-orion5x/mpp.c +++ b/arch/arm/mach-orion5x/mpp.c | |||
| @@ -11,7 +11,7 @@ | |||
| 11 | #include <linux/kernel.h> | 11 | #include <linux/kernel.h> |
| 12 | #include <linux/init.h> | 12 | #include <linux/init.h> |
| 13 | #include <linux/mbus.h> | 13 | #include <linux/mbus.h> |
| 14 | #include <asm/hardware.h> | 14 | #include <mach/hardware.h> |
| 15 | #include <asm/io.h> | 15 | #include <asm/io.h> |
| 16 | #include "common.h" | 16 | #include "common.h" |
| 17 | #include "mpp.h" | 17 | #include "mpp.h" |