diff options
| author | Ben Dooks <ben-linux@fluff.org> | 2008-12-18 11:17:37 -0500 |
|---|---|---|
| committer | Ben Dooks <ben-linux@fluff.org> | 2008-12-18 11:17:37 -0500 |
| commit | 56c035c9ce1f1850969778af6a4cc0b99089b6c8 (patch) | |
| tree | b6f1998be0c1e6bb623a0c55e8ba04d74bb58cf2 /arch/arm/plat-s3c24xx/include | |
| parent | 7f2754378f3522a42daafdbb9d2385f341008454 (diff) | |
| parent | 438a5d42e052ec6126c5f1e24763b711210db33e (diff) | |
Merge branch 'next-s3c64xx-device' into next-merged
Conflicts:
arch/arm/mach-s3c2440/mach-at2440evb.c
Diffstat (limited to 'arch/arm/plat-s3c24xx/include')
| -rw-r--r-- | arch/arm/plat-s3c24xx/include/plat/map.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/plat-s3c24xx/include/plat/map.h b/arch/arm/plat-s3c24xx/include/plat/map.h index e7be0c0d3702..fef8ea8b8e1e 100644 --- a/arch/arm/plat-s3c24xx/include/plat/map.h +++ b/arch/arm/plat-s3c24xx/include/plat/map.h | |||
| @@ -51,7 +51,6 @@ | |||
| 51 | 51 | ||
| 52 | /* Standard size definitions for peripheral blocks. */ | 52 | /* Standard size definitions for peripheral blocks. */ |
| 53 | 53 | ||
| 54 | #define S3C24XX_SZ_IIC SZ_1M | ||
| 55 | #define S3C24XX_SZ_IIS SZ_1M | 54 | #define S3C24XX_SZ_IIS SZ_1M |
| 56 | #define S3C24XX_SZ_ADC SZ_1M | 55 | #define S3C24XX_SZ_ADC SZ_1M |
| 57 | #define S3C24XX_SZ_SPI SZ_1M | 56 | #define S3C24XX_SZ_SPI SZ_1M |