Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...

[pandora-kernel.git] / arch / arm / mach-s3c2410 / include / mach / h1940-latch.h

diff --git a/arch/arm/mach-s3c2410/include/mach/h1940-latch.h b/arch/arm/mach-s3c2410/include/mach/h1940-latch.h
index 73586f2..97e42bf 100644 (file)
--- a/arch/arm/mach-s3c2410/include/mach/h1940-latch.h
+++ b/arch/arm/mach-s3c2410/include/mach/h1940-latch.h
@@ -20,7 +20,7 @@
 
 /* SD layer latch */
 
-#define H1940_LATCH_SDQ1               H1940_LATCH_GPIO(0)
+#define H1940_LATCH_LCD_P0             H1940_LATCH_GPIO(0)
 #define H1940_LATCH_LCD_P1             H1940_LATCH_GPIO(1)
 #define H1940_LATCH_LCD_P2             H1940_LATCH_GPIO(2)
 #define H1940_LATCH_LCD_P3             H1940_LATCH_GPIO(3)
@@ -35,7 +35,7 @@
 #define H1940_LATCH_AUDIO_POWER                H1940_LATCH_GPIO(9)
 #define H1940_LATCH_SM803_ENABLE       H1940_LATCH_GPIO(10)
 #define H1940_LATCH_LCD_P4             H1940_LATCH_GPIO(11)
-#define H1940_LATCH_CPUQ5              H1940_LATCH_GPIO(12)
+#define H1940_LATCH_SD_POWER           H1940_LATCH_GPIO(12)
 #define H1940_LATCH_BLUETOOTH_POWER    H1940_LATCH_GPIO(13)
 #define H1940_LATCH_LED_GREEN          H1940_LATCH_GPIO(14)
 #define H1940_LATCH_LED_FLASH          H1940_LATCH_GPIO(15)