diff options
| author | Ben Dooks <ben-linux@fluff.org> | 2008-11-03 08:53:52 +0000 |
|---|---|---|
| committer | Ben Dooks <ben-linux@fluff.org> | 2008-11-03 08:53:52 +0000 |
| commit | f430ce6ec4c8071d358e56d531ad77bdb5cf1820 (patch) | |
| tree | 94e2d6b4d84148b7b118dfedebbbd6728dfa5547 /arch/cris/arch-v10/drivers/axisflashmap.c | |
| parent | 2c68bcc9ffc5de11493f99e0ea891003f9c0a835 (diff) | |
| parent | 45beca08dd8b6d6a65c5ffd730af2eac7a2c7a03 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into s3c64xx
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 b3bdda93ffe..b2079703af7 100644 --- a/arch/cris/arch-v10/drivers/axisflashmap.c +++ b/arch/cris/arch-v10/drivers/axisflashmap.c @@ -26,7 +26,7 @@ #include <asm/axisflashmap.h> #include <asm/mmu.h> -#include <asm/arch/sv_addr_ag.h> +#include <arch/sv_addr_ag.h> #ifdef CONFIG_CRIS_LOW_MAP #define FLASH_UNCACHED_ADDR KSEG_8 |