summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-s3c2410
diff options
context:
space:
mode:
authorBen Dooks <ben-linux@fluff.org>2009-08-14 15:24:06 +0100
committerBen Dooks <ben-linux@fluff.org>2009-08-14 15:24:06 +0100
commitb282e29b547937d1610f38d6aa1c485426b62650 (patch)
tree62741a6d17e910e7b77a5cc4e94c44b7e587645c /arch/arm/mach-s3c2410
parentc378aa275e1476218a6b438056a4cd48eb1eca0f (diff)
parentc233d94931cebc8ec805fb98856f34ad16d49e4f (diff)
downloadop-kernel-dev-b282e29b547937d1610f38d6aa1c485426b62650.zip
op-kernel-dev-b282e29b547937d1610f38d6aa1c485426b62650.tar.gz
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.h1
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 11cce09..b049e61 100644
--- a/arch/arm/mach-s3c2410/include/mach/map.h
+++ b/arch/arm/mach-s3c2410/include/mach/map.h
@@ -110,5 +110,6 @@
#define S3C_PA_UART S3C24XX_PA_UART
#define S3C_PA_USBHOST S3C2410_PA_USBHOST
#define S3C_PA_HSMMC0 S3C2443_PA_HSMMC
+#define S3C_PA_NAND S3C24XX_PA_NAND
#endif /* __ASM_ARCH_MAP_H */
OpenPOWER on IntegriCloud