diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-11-01 17:51:51 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-11-01 17:51:51 +0100 |
| commit | 0242909a6135e10a28822c64f9ad50fdad52757c (patch) | |
| tree | c5f9c8abe95a65433e6ac356871f2379c02488fe /arch/cris/arch-v32/drivers/mach-fs/nandflash.c | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmo... (diff) | |
| parent | [CRIS] Move header files from include to arch/cris/include. (diff) | |
| download | linux-0242909a6135e10a28822c64f9ad50fdad52757c.tar.xz linux-0242909a6135e10a28822c64f9ad50fdad52757c.zip | |
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-v32/drivers/mach-fs/nandflash.c')
| -rw-r--r-- | arch/cris/arch-v32/drivers/mach-fs/nandflash.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/cris/arch-v32/drivers/mach-fs/nandflash.c b/arch/cris/arch-v32/drivers/mach-fs/nandflash.c index aa01b134458a..c5a0f54763cc 100644 --- a/arch/cris/arch-v32/drivers/mach-fs/nandflash.c +++ b/arch/cris/arch-v32/drivers/mach-fs/nandflash.c @@ -18,7 +18,7 @@ #include <linux/mtd/mtd.h> #include <linux/mtd/nand.h> #include <linux/mtd/partitions.h> -#include <asm/arch/memmap.h> +#include <arch/memmap.h> #include <hwregs/reg_map.h> #include <hwregs/reg_rdwr.h> #include <hwregs/gio_defs.h> |