Merge omap-drivers

[linux-2.6-omap-h63xx.git] / arch / arm / mach-omap2 / prcm-regs.h

diff --git a/arch/arm/mach-omap2/prcm-regs.h b/arch/arm/mach-omap2/prcm-regs.h
index 5e1c4b53ee9de1af966f138f77758b132c46bd8d..941ef6321ab94bbe10608a81317d2a18d45fd9b6 100644 (file)
--- a/arch/arm/mach-omap2/prcm-regs.h
+++ b/arch/arm/mach-omap2/prcm-regs.h
@@ -240,7 +240,7 @@
 #define GPIO3_SYSCONFIG                __REG32((GPIOX_BASE(3) + 0x10))
 #define GPIO4_SYSCONFIG                __REG32((GPIOX_BASE(4) + 0x10))
 
-#if defined(CONFIG_ARCH_OMAP243X)
+#if defined(CONFIG_ARCH_OMAP2430)
 #define GPIO5_SYSCONFIG                __REG32((OMAP24XX_GPIO5_BASE + 0x10))
 #endif
 
@@ -332,7 +332,7 @@
 #define GPIO4_DEBOUNCENABLE    GPIO4_REG32(0x050)
 #define GPIO4_DEBOUNCINGTIME   GPIO4_REG32(0x054)
 
-#if defined(CONFIG_ARCH_OMAP243X)
+#if defined(CONFIG_ARCH_OMAP2430)
 /* GPIO 5 */
 #define GPIO5_REG32(offset)    __REG32((OMAP24XX_GPIO5_BASE + (offset)))
 #define GPIO5_IRQENABLE1       GPIO5_REG32(0x01C)