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-ns9xxx/mach-cc9p9360js.c | |
| parent | fbdbf709938d155c719c76b9894d28342632c797 (diff) | |
| parent | 72d31053f62c4bc464c2783974926969614a8649 (diff) | |
| download | blackbird-op-linux-0b88641f1bafdbd087d5e63987a30cc0eadd63b9.tar.gz blackbird-op-linux-0b88641f1bafdbd087d5e63987a30cc0eadd63b9.zip | |
Merge commit 'v2.6.27-rc7' into x86/debug
Diffstat (limited to 'arch/arm/mach-ns9xxx/mach-cc9p9360js.c')
| -rw-r--r-- | arch/arm/mach-ns9xxx/mach-cc9p9360js.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-ns9xxx/mach-cc9p9360js.c b/arch/arm/mach-ns9xxx/mach-cc9p9360js.c index fcc815bdd291..729f68da4293 100644 --- a/arch/arm/mach-ns9xxx/mach-cc9p9360js.c +++ b/arch/arm/mach-ns9xxx/mach-cc9p9360js.c @@ -11,7 +11,7 @@ #include <asm/mach/arch.h> #include <asm/mach-types.h> -#include <asm/arch-ns9xxx/processor-ns9360.h> +#include <mach/processor-ns9360.h> #include "board-jscc9p9360.h" #include "generic.h" |
