Merge branches 'topic/fix/misc' and 'topic/fix/hda' into for-linus

[sfrench/cifs-2.6.git] / arch / arm / mach-ks8695 / include / mach / regs-gpio.h

diff --git a/arch/arm/mach-ks8695/include/mach/regs-gpio.h b/arch/arm/mach-ks8695/include/mach/regs-gpio.h
index 0df6fe61d1ce59afe761183b5c073551f5c71bd3..90614a7d05486a1e7fb785c5622041a24147446c 100644 (file)
--- a/arch/arm/mach-ks8695/include/mach/regs-gpio.h
+++ b/arch/arm/mach-ks8695/include/mach/regs-gpio.h
@@ -24,7 +24,7 @@
 
 
 /* Port Mode Register */
-#define IOPM_(x)               (1 << (x))      /* Mode for GPIO Pin x */
+#define IOPM(x)                        (1 << (x))      /* Mode for GPIO Pin x */
 
 /* Port Control Register */
 #define IOPC_IOTIM1EN          (1 << 17)       /* GPIO Pin for Timer1 Enable */
@@ -50,6 +50,6 @@
 #define IOPC_TM_EDGE           (6)             /* Both Edge Detection */
 
 /* Port Data Register */
-#define IOPD_(x)               (1 << (x))      /* Signal Level of GPIO Pin x */
+#define IOPD(x)                        (1 << (x))      /* Signal Level of GPIO Pin x */
 
 #endif