diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-08-20 05:52:15 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-08-20 05:52:15 -0400 |
| commit | 7393423dd9b5790a3115873be355e9fc862bce8f (patch) | |
| tree | fc83214602c8ce41dc06d5c8e21deada679521f7 /arch/arm/mach-orion5x/db88f5281-setup.c | |
| parent | 8df9676d6402563da91427e8d9f2da8a4598aede (diff) | |
| parent | 1fca25427482387689fa27594c992a961d98768f (diff) | |
Merge branch 'linus' into x86/cleanups
Diffstat (limited to 'arch/arm/mach-orion5x/db88f5281-setup.c')
| -rw-r--r-- | arch/arm/mach-orion5x/db88f5281-setup.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-orion5x/db88f5281-setup.c b/arch/arm/mach-orion5x/db88f5281-setup.c index 48ce6d0e0020..ff13e9060b18 100644 --- a/arch/arm/mach-orion5x/db88f5281-setup.c +++ b/arch/arm/mach-orion5x/db88f5281-setup.c | |||
| @@ -25,7 +25,7 @@ | |||
| 25 | #include <asm/mach/arch.h> | 25 | #include <asm/mach/arch.h> |
| 26 | #include <asm/mach/pci.h> | 26 | #include <asm/mach/pci.h> |
| 27 | #include <mach/orion5x.h> | 27 | #include <mach/orion5x.h> |
| 28 | #include <asm/plat-orion/orion_nand.h> | 28 | #include <plat/orion_nand.h> |
| 29 | #include "common.h" | 29 | #include "common.h" |
| 30 | #include "mpp.h" | 30 | #include "mpp.h" |
| 31 | 31 | ||