diff options
| author | Ben Dooks <ben-linux@fluff.org> | 2009-08-14 10:24:06 -0400 |
|---|---|---|
| committer | Ben Dooks <ben-linux@fluff.org> | 2009-08-14 10:24:06 -0400 |
| commit | b282e29b547937d1610f38d6aa1c485426b62650 (patch) | |
| tree | 62741a6d17e910e7b77a5cc4e94c44b7e587645c /arch/arm/mach-s3c2410 | |
| parent | c378aa275e1476218a6b438056a4cd48eb1eca0f (diff) | |
| parent | c233d94931cebc8ec805fb98856f34ad16d49e4f (diff) | |
Merge branch 'next-s3c64xx-moves' into next-s3c
Diffstat (limited to 'arch/arm/mach-s3c2410')
| -rw-r--r-- | arch/arm/mach-s3c2410/include/mach/map.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-s3c2410/include/mach/map.h b/arch/arm/mach-s3c2410/include/mach/map.h index 11cce0975502..b049e61460b6 100644 --- a/arch/arm/mach-s3c2410/include/mach/map.h +++ b/arch/arm/mach-s3c2410/include/mach/map.h | |||
| @@ -110,5 +110,6 @@ | |||
| 110 | #define S3C_PA_UART S3C24XX_PA_UART | 110 | #define S3C_PA_UART S3C24XX_PA_UART |
| 111 | #define S3C_PA_USBHOST S3C2410_PA_USBHOST | 111 | #define S3C_PA_USBHOST S3C2410_PA_USBHOST |
| 112 | #define S3C_PA_HSMMC0 S3C2443_PA_HSMMC | 112 | #define S3C_PA_HSMMC0 S3C2443_PA_HSMMC |
| 113 | #define S3C_PA_NAND S3C24XX_PA_NAND | ||
| 113 | 114 | ||
| 114 | #endif /* __ASM_ARCH_MAP_H */ | 115 | #endif /* __ASM_ARCH_MAP_H */ |