Browse Source

[ARM] S3C: Move nand headers to arch/arm/plat-s3c/include/plat

Move nand headers to arch/arm/plat-s3c/include/plat
ready to clean out the old include directories.

Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Ben Dooks 16 years ago
parent
commit
7926b5a325

+ 1 - 1
arch/arm/mach-s3c2410/mach-bast.c

@@ -44,7 +44,7 @@
 #include <mach/regs-mem.h>
 #include <mach/regs-mem.h>
 #include <mach/regs-lcd.h>
 #include <mach/regs-lcd.h>
 
 
-#include <asm/plat-s3c/nand.h>
+#include <plat/nand.h>
 #include <plat/iic.h>
 #include <plat/iic.h>
 #include <mach/fb.h>
 #include <mach/fb.h>
 
 

+ 1 - 1
arch/arm/mach-s3c2410/mach-qt2410.c

@@ -50,7 +50,7 @@
 #include <mach/leds-gpio.h>
 #include <mach/leds-gpio.h>
 #include <plat/regs-serial.h>
 #include <plat/regs-serial.h>
 #include <mach/fb.h>
 #include <mach/fb.h>
-#include <asm/plat-s3c/nand.h>
+#include <plat/nand.h>
 #include <asm/plat-s3c24xx/udc.h>
 #include <asm/plat-s3c24xx/udc.h>
 #include <mach/spi.h>
 #include <mach/spi.h>
 #include <mach/spi-gpio.h>
 #include <mach/spi-gpio.h>

+ 1 - 1
arch/arm/mach-s3c2412/mach-jive.c

@@ -31,7 +31,7 @@
 #include <asm/mach/irq.h>
 #include <asm/mach/irq.h>
 
 
 #include <plat/regs-serial.h>
 #include <plat/regs-serial.h>
-#include <asm/plat-s3c/nand.h>
+#include <plat/nand.h>
 #include <plat/iic.h>
 #include <plat/iic.h>
 
 
 #include <mach/regs-power.h>
 #include <mach/regs-power.h>

+ 1 - 1
arch/arm/mach-s3c2412/mach-vstms.c

@@ -39,7 +39,7 @@
 #include <mach/idle.h>
 #include <mach/idle.h>
 #include <mach/fb.h>
 #include <mach/fb.h>
 
 
-#include <asm/plat-s3c/nand.h>
+#include <plat/nand.h>
 
 
 #include <plat/s3c2410.h>
 #include <plat/s3c2410.h>
 #include <plat/s3c2412.h>
 #include <plat/s3c2412.h>

+ 1 - 1
arch/arm/mach-s3c2440/mach-anubis.c

@@ -39,7 +39,7 @@
 #include <mach/regs-gpio.h>
 #include <mach/regs-gpio.h>
 #include <mach/regs-mem.h>
 #include <mach/regs-mem.h>
 #include <mach/regs-lcd.h>
 #include <mach/regs-lcd.h>
-#include <asm/plat-s3c/nand.h>
+#include <plat/nand.h>
 
 
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/nand.h>
 #include <linux/mtd/nand.h>

+ 1 - 1
arch/arm/mach-s3c2440/mach-at2440evb.c

@@ -35,7 +35,7 @@
 #include <mach/regs-gpio.h>
 #include <mach/regs-gpio.h>
 #include <mach/regs-mem.h>
 #include <mach/regs-mem.h>
 #include <mach/regs-lcd.h>
 #include <mach/regs-lcd.h>
-#include <asm/plat-s3c/nand.h>
+#include <plat/nand.h>
 
 
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/nand.h>
 #include <linux/mtd/nand.h>

+ 1 - 1
arch/arm/mach-s3c2440/mach-osiris.c

@@ -37,7 +37,7 @@
 #include <mach/regs-gpio.h>
 #include <mach/regs-gpio.h>
 #include <mach/regs-mem.h>
 #include <mach/regs-mem.h>
 #include <mach/regs-lcd.h>
 #include <mach/regs-lcd.h>
-#include <asm/plat-s3c/nand.h>
+#include <plat/nand.h>
 
 
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/nand.h>
 #include <linux/mtd/nand.h>

+ 1 - 1
arch/arm/mach-s3c2440/mach-rx3715.c

@@ -42,7 +42,7 @@
 #include <mach/regs-lcd.h>
 #include <mach/regs-lcd.h>
 
 
 #include <mach/h1940.h>
 #include <mach/h1940.h>
-#include <asm/plat-s3c/nand.h>
+#include <plat/nand.h>
 #include <mach/fb.h>
 #include <mach/fb.h>
 
 
 #include <plat/clock.h>
 #include <plat/clock.h>

+ 0 - 0
include/asm-arm/plat-s3c/nand.h → arch/arm/plat-s3c/include/plat/nand.h


+ 0 - 0
include/asm-arm/plat-s3c/regs-nand.h → arch/arm/plat-s3c/include/plat/regs-nand.h


+ 1 - 1
arch/arm/plat-s3c24xx/common-smdk.c

@@ -38,7 +38,7 @@
 #include <mach/regs-gpio.h>
 #include <mach/regs-gpio.h>
 #include <mach/leds-gpio.h>
 #include <mach/leds-gpio.h>
 
 
-#include <asm/plat-s3c/nand.h>
+#include <plat/nand.h>
 
 
 #include <plat/common-smdk.h>
 #include <plat/common-smdk.h>
 #include <plat/devs.h>
 #include <plat/devs.h>

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

@@ -45,8 +45,8 @@
 
 
 #include <asm/io.h>
 #include <asm/io.h>
 
 
-#include <asm/plat-s3c/regs-nand.h>
-#include <asm/plat-s3c/nand.h>
+#include <plat/regs-nand.h>
+#include <plat/nand.h>
 
 
 #ifdef CONFIG_MTD_NAND_S3C2410_HWECC
 #ifdef CONFIG_MTD_NAND_S3C2410_HWECC
 static int hardware_ecc = 1;
 static int hardware_ecc = 1;