[ARM] S3C24XX: Move mci.h to arch/arm/plat-s3c24xx/include/plat

Move mci.h to new position in arch/arm/plat-s3c24xx/include/plat
ready to clean out old include directories.

Signed-off-by: Ben Dooks <ben-linux@fluff.org>

diff --git a/arch/arm/plat-s3c24xx/include/plat/mci.h b/arch/arm/plat-s3c24xx/include/plat/mci.h
new file mode 100644 (file)
index 0000000..2d0852a
--- /dev/null
+++ b/arch/arm/plat-s3c24xx/include/plat/mci.h
@@ -0,0 +1,15 @@
+#ifndef _ARCH_MCI_H
+#define _ARCH_MCI_H
+
+struct s3c24xx_mci_pdata {
+       unsigned int    wprotect_invert : 1;
+       unsigned int    detect_invert : 1;   /* set => detect active high. */
+
+       unsigned int    gpio_detect;
+       unsigned int    gpio_wprotect;
+       unsigned long   ocr_avail;
+       void            (*set_power)(unsigned char power_mode,
+                                    unsigned short vdd);
+};
+
+#endif /* _ARCH_NCI_H */

diff --git a/drivers/mmc/host/s3cmci.c b/drivers/mmc/host/s3cmci.c
index 3b2085b57769b5f72836aefb2a06de89df7d56fd..fcc98a4cce3cc887a597d87d1bd88cb3d3bd5e8a 100644 (file)
--- a/drivers/mmc/host/s3cmci.c
+++ b/drivers/mmc/host/s3cmci.c
@@ -25,7 +25,7 @@
 #include <mach/regs-sdi.h>
 #include <mach/regs-gpio.h>
 
-#include <asm/plat-s3c24xx/mci.h>
+#include <plat/mci.h>
 
 #include "s3cmci.h"
 

diff --git a/include/asm-arm/plat-s3c24xx/mci.h b/include/asm-arm/plat-s3c24xx/mci.h
deleted file mode 100644 (file)
index 2d0852a..0000000
--- a/include/asm-arm/plat-s3c24xx/mci.h
+++ /dev/null
@@ -1,15 +0,0 @@
-#ifndef _ARCH_MCI_H
-#define _ARCH_MCI_H
-
-struct s3c24xx_mci_pdata {
-       unsigned int    wprotect_invert : 1;
-       unsigned int    detect_invert : 1;   /* set => detect active high. */
-
-       unsigned int    gpio_detect;
-       unsigned int    gpio_wprotect;
-       unsigned long   ocr_avail;
-       void            (*set_power)(unsigned char power_mode,
-                                    unsigned short vdd);
-};
-
-#endif /* _ARCH_NCI_H */