arm: s3c: Unify the S3C24xx SDI structure

[karo-tx-uboot.git] / arch / arm / include / asm / arch-s3c24x0 / s3c24x0.h

diff --git a/arch/arm/include/asm/arch-s3c24x0/s3c24x0.h b/arch/arm/include/asm/arch-s3c24x0/s3c24x0.h
index 86d720c06e9cb8c5d8cbd8f8a83a27f3ec989f32..c122eb909272a0953febbc235614fd7cb9a17c55 100644 (file)
--- a/arch/arm/include/asm/arch-s3c24x0/s3c24x0.h
+++ b/arch/arm/include/asm/arch-s3c24x0/s3c24x0.h
@@ -675,7 +675,7 @@ struct s3c2400_mmc {
 
 
 /* SD INTERFACE (see S3C2410 manual chapter 19) */
-struct s3c2410_sdi {
+struct s3c24x0_sdi {
        u32     sdicon;
        u32     sdipre;
        u32     sdicarg;
@@ -691,14 +691,13 @@ struct s3c2410_sdi {
        u32     sdidcnt;
        u32     sdidsta;
        u32     sdifsta;
-#ifdef __BIG_ENDIAN
-       u8      res[3];
-       u8      sdidat;
+#ifdef CONFIG_S3C2410
+       u32     sdidat;
+       u32     sdiimsk;
 #else
-       u8      sdidat;
-       u8      res[3];
-#endif
        u32     sdiimsk;
+       u32     sdidat;
+#endif
 };
 
 #endif /*__S3C24X0_H__*/