diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-08-17 13:16:28 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-08-17 13:16:28 -0400 |
| commit | 29c08460d472e427cec5e5dcb12ec74c923f8250 (patch) | |
| tree | 9d8557fe9cf123920c3ceb023274e763e5f208b0 /arch/arm/mach-s3c24a0/include/mach/map.h | |
| parent | 9b2616c2e8cc98ca98bbb40cad83a8d3d859e840 (diff) | |
| parent | baa28e3530375e0bef2c53243634a1c78f5c02f3 (diff) | |
Merge branch 'next-s3c' of git://aeryn.fluff.org.uk/bjdooks/linux into devel-stable
Diffstat (limited to 'arch/arm/mach-s3c24a0/include/mach/map.h')
| -rw-r--r-- | arch/arm/mach-s3c24a0/include/mach/map.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-s3c24a0/include/mach/map.h b/arch/arm/mach-s3c24a0/include/mach/map.h index a01132717e34..79e4d93ea2b6 100644 --- a/arch/arm/mach-s3c24a0/include/mach/map.h +++ b/arch/arm/mach-s3c24a0/include/mach/map.h | |||
| @@ -81,5 +81,6 @@ | |||
| 81 | 81 | ||
| 82 | #define S3C_PA_UART S3C24A0_PA_UART | 82 | #define S3C_PA_UART S3C24A0_PA_UART |
| 83 | #define S3C_PA_IIC S3C24A0_PA_IIC | 83 | #define S3C_PA_IIC S3C24A0_PA_IIC |
| 84 | #define S3C_PA_NAND S3C24XX_PA_NAND | ||
| 84 | 85 | ||
| 85 | #endif /* __ASM_ARCH_24A0_MAP_H */ | 86 | #endif /* __ASM_ARCH_24A0_MAP_H */ |