Merge branch 'master' of git://git.denx.de/u-boot-blackfin

diff --git a/include/s3c24x0.h b/include/s3c24x0.h
index 71f35a5174280fc8fb1fe1b7271a156efd42fc43..4fa8000681d994eb51feae94dcf1a5350a3bbbd0 100644 (file)
--- a/include/s3c24x0.h
+++ b/include/s3c24x0.h
@@ -550,14 +550,20 @@ typedef struct {
 
 /* SPI (see manual chapter 22) */
 typedef struct {
-       S3C24X0_REG32   SPCON;
-       S3C24X0_REG32   SPSTA;
-       S3C24X0_REG32   SPPIN;
-       S3C24X0_REG32   SPPRE;
-       S3C24X0_REG32   SPTDAT;
-       S3C24X0_REG32   SPRDAT;
-       S3C24X0_REG32   res[2];
-} __attribute__((__packed__)) S3C24X0_SPI_CHANNEL;
+       S3C24X0_REG8    SPCON;
+       S3C24X0_REG8    res1[3];
+       S3C24X0_REG8    SPSTA;
+       S3C24X0_REG8    res2[3];
+       S3C24X0_REG8    SPPIN;
+       S3C24X0_REG8    res3[3];
+       S3C24X0_REG8    SPPRE;
+       S3C24X0_REG8    res4[3];
+       S3C24X0_REG8    SPTDAT;
+       S3C24X0_REG8    res5[3];
+       S3C24X0_REG8    SPRDAT;
+       S3C24X0_REG8    res6[3];
+       S3C24X0_REG8    res7[16];
+} /*__attribute__((__packed__))*/ S3C24X0_SPI_CHANNEL;
 
 typedef struct {
        S3C24X0_SPI_CHANNEL     ch[S3C24X0_SPI_CHANNELS];