aboutsummaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorJonas Bonn <jonas.bonn@gmail.com>2008-11-19 17:11:03 +0000
committerAndy Green <agreen@pads.home.warmcat.com>2008-11-19 17:11:03 +0000
commitd0c8d0171cd643228939d0d1466f226b20ae3eb8 (patch)
tree5a94d5c50d8268fba09da04bd93c512242a5127d /arch
parent15038fb570748ce2fb9ce31200b1f075774a7f4d (diff)
Move asm/arch/mci.h to mach/mci.h
Signed-off-by: Jonas Bonn <jonas.bonn@gmail.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-s3c2410/include/mach/mci.h13
-rw-r--r--arch/arm/mach-s3c2410/mach-gta01.c2
-rw-r--r--arch/arm/mach-s3c2440/mach-gta02.c2
3 files changed, 15 insertions, 2 deletions
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 00000000000..24e6cd1dd0c
--- /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 41383ad6dcf..47ea645ec9e 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 33d6cbafb7b..24afd04ecdb 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>