aboutsummaryrefslogtreecommitdiff
path: root/arch/arm/mach-s3c2410/include
diff options
context:
space:
mode:
authormerge <null@invalid>2009-03-10 08:10:41 +0000
committerAndy Green <agreen@octopus.localdomain>2009-03-10 08:10:41 +0000
commite8ee87681eb8a32f8a695053523e99ffcd5feb83 (patch)
treec9c166207b464529d994949a95cf97f45641ea82 /arch/arm/mach-s3c2410/include
parent8771f76e8249627e82a3530ce3008116619e8284 (diff)
MERGE-andy-tracking-patchset-edits
Diffstat (limited to 'arch/arm/mach-s3c2410/include')
-rw-r--r--arch/arm/mach-s3c2410/include/mach/map.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-s3c2410/include/mach/map.h b/arch/arm/mach-s3c2410/include/mach/map.h
index 255fdfeaf95..e99b212cb1c 100644
--- a/arch/arm/mach-s3c2410/include/mach/map.h
+++ b/arch/arm/mach-s3c2410/include/mach/map.h
@@ -84,7 +84,6 @@
#define S3C24XX_PA_IRQ S3C2410_PA_IRQ
#define S3C24XX_PA_MEMCTRL S3C2410_PA_MEMCTRL
-#define S3C24XX_PA_USBHOST S3C2410_PA_USBHOST
#define S3C24XX_PA_DMA S3C2410_PA_DMA
#define S3C24XX_PA_CLKPWR S3C2410_PA_CLKPWR
#define S3C24XX_PA_LCD S3C2410_PA_LCD
@@ -102,6 +101,7 @@
#define S3C_PA_IIC S3C2410_PA_IIC
#define S3C_PA_UART S3C24XX_PA_UART
+#define S3C_PA_USBHOST S3C2410_PA_USBHOST
#define S3C_PA_HSMMC0 S3C2443_PA_HSMMC
#endif /* __ASM_ARCH_MAP_H */