Merge branch 'master' of ssh://git.infradead.org/srv/git/mtd-2.6

39fd179a · David Woodhouse · 49dc08ee · b7a70185 · 39fd179a
隐藏空白更改
内联并排

Showing with 2 addition and 2 deletion

drivers/mtd/nand/s3c2410.c drivers/mtd/nand/s3c2410.c +2 -2

未找到文件。
--- a/drivers/mtd/nand/s3c2410.c
+++ b/drivers/mtd/nand/s3c2410.c
@@ -60,8 +60,8 @@

 #include <asm/io.h>

-#include <asm/arch/regs-nand.h>
-#include <asm/arch/nand.h>
+#include <asm/plat-s3c/regs-nand.h>
+#include <asm/plat-s3c/nand.h>

 #ifdef CONFIG_MTD_NAND_S3C2410_HWECC
 static int hardware_ecc = 1;