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/mach-s3c24a0/include/mach/map.h | |
| 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/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 @@ | |||
| 71 | #define S3C24XX_PA_TIMER S3C24A0_PA_TIMER | 71 | #define S3C24XX_PA_TIMER S3C24A0_PA_TIMER |
| 72 | #define S3C24XX_PA_USBDEV S3C24A0_PA_USBDEV | 72 | #define S3C24XX_PA_USBDEV S3C24A0_PA_USBDEV |
| 73 | #define S3C24XX_PA_WATCHDOG S3C24A0_PA_WATCHDOG | 73 | #define S3C24XX_PA_WATCHDOG S3C24A0_PA_WATCHDOG |
| 74 | #define S3C24XX_PA_IIC S3C24A0_PA_IIC | ||
| 75 | #define S3C24XX_PA_IIS S3C24A0_PA_IIS | 74 | #define S3C24XX_PA_IIS S3C24A0_PA_IIS |
| 76 | #define S3C24XX_PA_GPIO S3C24A0_PA_GPIO | 75 | #define S3C24XX_PA_GPIO S3C24A0_PA_GPIO |
| 77 | #define S3C24XX_PA_RTC S3C24A0_PA_RTC | 76 | #define S3C24XX_PA_RTC S3C24A0_PA_RTC |
| @@ -81,5 +80,6 @@ | |||
| 81 | #define S3C24XX_PA_NAND S3C24A0_PA_NAND | 80 | #define S3C24XX_PA_NAND S3C24A0_PA_NAND |
| 82 | 81 | ||
| 83 | #define S3C_PA_UART S3C24A0_PA_UART | 82 | #define S3C_PA_UART S3C24A0_PA_UART |
| 83 | #define S3C_PA_IIC S3C24A0_PA_IIC | ||
| 84 | 84 | ||
| 85 | #endif /* __ASM_ARCH_24A0_MAP_H */ | 85 | #endif /* __ASM_ARCH_24A0_MAP_H */ |