diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-11-12 06:39:21 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-11-12 06:39:21 -0500 |
| commit | 708b8eae0fd532af73ea8350e6dcc10255ff7376 (patch) | |
| tree | f336436934fd79bc91aff7112a9beb10bc4e839f /arch/cris/arch-v10/drivers/axisflashmap.c | |
| parent | d98d38f2014ab79f28c126ff175d034891f7aefc (diff) | |
| parent | f21f237cf55494c3a4209de323281a3b0528da10 (diff) | |
Merge branch 'linus' into core/locking
Diffstat (limited to 'arch/cris/arch-v10/drivers/axisflashmap.c')
| -rw-r--r-- | arch/cris/arch-v10/drivers/axisflashmap.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/cris/arch-v10/drivers/axisflashmap.c b/arch/cris/arch-v10/drivers/axisflashmap.c index b3bdda93ffef..b2079703af7e 100644 --- a/arch/cris/arch-v10/drivers/axisflashmap.c +++ b/arch/cris/arch-v10/drivers/axisflashmap.c | |||
| @@ -26,7 +26,7 @@ | |||
| 26 | 26 | ||
| 27 | #include <asm/axisflashmap.h> | 27 | #include <asm/axisflashmap.h> |
| 28 | #include <asm/mmu.h> | 28 | #include <asm/mmu.h> |
| 29 | #include <asm/arch/sv_addr_ag.h> | 29 | #include <arch/sv_addr_ag.h> |
| 30 | 30 | ||
| 31 | #ifdef CONFIG_CRIS_LOW_MAP | 31 | #ifdef CONFIG_CRIS_LOW_MAP |
| 32 | #define FLASH_UNCACHED_ADDR KSEG_8 | 32 | #define FLASH_UNCACHED_ADDR KSEG_8 |