Signed-off-by: Jonas Bonn <[EMAIL PROTECTED]>
---
arch/arm/mach-s3c2410/include/mach/mci.h | 13 +++++++++++++
arch/arm/mach-s3c2410/mach-gta01.c | 2 +-
arch/arm/mach-s3c2440/mach-gta02.c | 2 +-
drivers/mmc/host/s3cmci.c | 2 +-
drivers/sdio/hcd/s3c24xx/s3c24xx_hcd.c | 2 +-
include/asm-arm/arch-s3c2410/mci.h | 13 -------------
6 files changed, 17 insertions(+), 17 deletions(-)
create mode 100644 arch/arm/mach-s3c2410/include/mach/mci.h
delete mode 100644 include/asm-arm/arch-s3c2410/mci.h
diff --git a/arch/arm/mach-s3c2410/include/mach/mci.h
b/arch/arm/mach-s3c2410/include/mach/mci.h
new file mode 100644
index 0000000..24e6cd1
--- /dev/null
+++ b/arch/arm/mach-s3c2410/include/mach/mci.h
@@ -0,0 +1,13 @@
+#ifndef _ARCH_MCI_H
+#define _ARCH_MCI_H
+
+struct s3c24xx_mci_pdata {
+ unsigned int gpio_detect;
+ unsigned int gpio_wprotect;
+ unsigned long ocr_avail;
+ unsigned int do_dma;
+ void (*set_power)(unsigned char power_mode,
+ unsigned short vdd);
+};
+
+#endif /* _ARCH_NCI_H */
diff --git a/arch/arm/mach-s3c2410/mach-gta01.c
b/arch/arm/mach-s3c2410/mach-gta01.c
index 41383ad..47ea645 100644
--- a/arch/arm/mach-s3c2410/mach-gta01.c
+++ b/arch/arm/mach-s3c2410/mach-gta01.c
@@ -60,7 +60,7 @@
#include <mach/regs-gpio.h>
#include <mach/fb.h>
-#include <asm/arch/mci.h>
+#include <mach/mci.h>
#include <mach/spi.h>
#include <asm/arch/spi-gpio.h>
#include <mach/usb-control.h>
diff --git a/arch/arm/mach-s3c2440/mach-gta02.c
b/arch/arm/mach-s3c2440/mach-gta02.c
index 33d6cba..24afd04 100644
--- a/arch/arm/mach-s3c2440/mach-gta02.c
+++ b/arch/arm/mach-s3c2440/mach-gta02.c
@@ -61,7 +61,7 @@
#include <mach/regs-gpio.h>
#include <mach/regs-gpioj.h>
#include <mach/fb.h>
-#include <asm/arch-s3c2410/mci.h>
+#include <mach/mci.h>
#include <asm/arch-s3c2410/ts.h>
#include <mach/spi.h>
#include <asm/arch-s3c2410/spi-gpio.h>
diff --git a/drivers/mmc/host/s3cmci.c b/drivers/mmc/host/s3cmci.c
index c62db87..9e524f7 100644
--- a/drivers/mmc/host/s3cmci.c
+++ b/drivers/mmc/host/s3cmci.c
@@ -30,7 +30,7 @@
#include <asm/io.h>
#include <asm/arch/regs-sdi.h>
#include <mach/regs-gpio.h>
-#include <asm/arch/mci.h>
+#include <mach/mci.h>
#include <mach/dma.h>
#include "s3cmci.h"
diff --git a/drivers/sdio/hcd/s3c24xx/s3c24xx_hcd.c
b/drivers/sdio/hcd/s3c24xx/s3c24xx_hcd.c
index 8fd3f40..4e512fa 100644
--- a/drivers/sdio/hcd/s3c24xx/s3c24xx_hcd.c
+++ b/drivers/sdio/hcd/s3c24xx/s3c24xx_hcd.c
@@ -48,7 +48,7 @@
#include <asm/arch-s3c2410/regs-sdi.h>
#include <mach/regs-gpio.h>
-#include <asm/arch-s3c2410/mci.h>
+#include <mach/mci.h>
#include <asm/arch-s3c2410/gta02.h>
#include "s3c24xx_hcd.h"
diff --git a/include/asm-arm/arch-s3c2410/mci.h
b/include/asm-arm/arch-s3c2410/mci.h
deleted file mode 100644
index 24e6cd1..0000000
--- a/include/asm-arm/arch-s3c2410/mci.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#ifndef _ARCH_MCI_H
-#define _ARCH_MCI_H
-
-struct s3c24xx_mci_pdata {
- unsigned int gpio_detect;
- unsigned int gpio_wprotect;
- unsigned long ocr_avail;
- unsigned int do_dma;
- void (*set_power)(unsigned char power_mode,
- unsigned short vdd);
-};
-
-#endif /* _ARCH_NCI_H */
--
1.5.6.3
