diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-11-01 09:51:51 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-11-01 09:51:51 -0700 |
| commit | 0242909a6135e10a28822c64f9ad50fdad52757c (patch) | |
| tree | c5f9c8abe95a65433e6ac356871f2379c02488fe /arch/cris/arch-v10/mm | |
| parent | 0a6d2fac615972142715d736289abeeb7382e81d (diff) | |
| parent | 556dcee7b829e5c350c3ffdbdb87a8b15aa3c5d3 (diff) | |
Merge branch 'cris_move' of git://www.jni.nu/cris
* 'cris_move' of git://www.jni.nu/cris:
[CRIS] Move header files from include to arch/cris/include.
[CRISv32] Remove warning in io.h
Diffstat (limited to 'arch/cris/arch-v10/mm')
| -rw-r--r-- | arch/cris/arch-v10/mm/fault.c | 2 | ||||
| -rw-r--r-- | arch/cris/arch-v10/mm/init.c | 2 | ||||
| -rw-r--r-- | arch/cris/arch-v10/mm/tlb.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/arch/cris/arch-v10/mm/fault.c b/arch/cris/arch-v10/mm/fault.c index 65504fd8092..087a2096f22 100644 --- a/arch/cris/arch-v10/mm/fault.c +++ b/arch/cris/arch-v10/mm/fault.c @@ -13,7 +13,7 @@ #include <linux/mm.h> #include <asm/uaccess.h> #include <asm/pgtable.h> -#include <asm/arch/svinto.h> +#include <arch/svinto.h> #include <asm/mmu_context.h> /* debug of low-level TLB reload */ diff --git a/arch/cris/arch-v10/mm/init.c b/arch/cris/arch-v10/mm/init.c index 742fd1974c2..baa746ce4e7 100644 --- a/arch/cris/arch-v10/mm/init.c +++ b/arch/cris/arch-v10/mm/init.c @@ -12,7 +12,7 @@ #include <asm/mmu.h> #include <asm/io.h> #include <asm/mmu_context.h> -#include <asm/arch/svinto.h> +#include <arch/svinto.h> extern void tlb_init(void); diff --git a/arch/cris/arch-v10/mm/tlb.c b/arch/cris/arch-v10/mm/tlb.c index 6baf5bd209e..4a496e4ffac 100644 --- a/arch/cris/arch-v10/mm/tlb.c +++ b/arch/cris/arch-v10/mm/tlb.c @@ -12,7 +12,7 @@ #include <asm/tlb.h> #include <asm/mmu_context.h> -#include <asm/arch/svinto.h> +#include <arch/svinto.h> #define D(x) |