diff options
| author | Ben Dooks <ben-linux@fluff.org> | 2008-12-18 17:17:37 +0100 |
|---|---|---|
| committer | Ben Dooks <ben-linux@fluff.org> | 2008-12-18 17:17:37 +0100 |
| commit | 56c035c9ce1f1850969778af6a4cc0b99089b6c8 (patch) | |
| tree | b6f1998be0c1e6bb623a0c55e8ba04d74bb58cf2 /arch/arm/mach-s3c24a0/include/mach/map.h | |
| parent | Merge branch 'next-s3c64xx' into next-merged (diff) | |
| parent | [ARM] SMDK6410: Add LCD (LCD48WVGA) definitions (diff) | |
| download | linux-56c035c9ce1f1850969778af6a4cc0b99089b6c8.tar.xz linux-56c035c9ce1f1850969778af6a4cc0b99089b6c8.zip | |
Merge branch 'next-s3c64xx-device' into next-merged
Conflicts:
arch/arm/mach-s3c2440/mach-at2440evb.c
Diffstat (limited to 'arch/arm/mach-s3c24a0/include/mach/map.h')
| -rw-r--r-- | arch/arm/mach-s3c24a0/include/mach/map.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-s3c24a0/include/mach/map.h b/arch/arm/mach-s3c24a0/include/mach/map.h index 6667355a47a1..a01132717e34 100644 --- a/arch/arm/mach-s3c24a0/include/mach/map.h +++ b/arch/arm/mach-s3c24a0/include/mach/map.h @@ -71,7 +71,6 @@ #define S3C24XX_PA_TIMER S3C24A0_PA_TIMER #define S3C24XX_PA_USBDEV S3C24A0_PA_USBDEV #define S3C24XX_PA_WATCHDOG S3C24A0_PA_WATCHDOG -#define S3C24XX_PA_IIC S3C24A0_PA_IIC #define S3C24XX_PA_IIS S3C24A0_PA_IIS #define S3C24XX_PA_GPIO S3C24A0_PA_GPIO #define S3C24XX_PA_RTC S3C24A0_PA_RTC @@ -81,5 +80,6 @@ #define S3C24XX_PA_NAND S3C24A0_PA_NAND #define S3C_PA_UART S3C24A0_PA_UART +#define S3C_PA_IIC S3C24A0_PA_IIC #endif /* __ASM_ARCH_24A0_MAP_H */ |