Cleanup patch to sync with mainline kernel

[linux-2.6-omap-h63xx.git] / include / asm-arm / arch-omap / mux.h

diff --git a/include/asm-arm/arch-omap/mux.h b/include/asm-arm/arch-omap/mux.h
index 0fc2cad2104a642a00c10c7ee1ed8f0665b74a86..0dc24d4ba59c7f7d291216299dae512c5dfd446d 100644 (file)
--- a/include/asm-arm/arch-omap/mux.h
+++ b/include/asm-arm/arch-omap/mux.h
@@ -171,7 +171,7 @@ enum omap730_index {
        E4_730_KBC2,
        F4_730_KBC3,
        E3_730_KBC4,
-    
+
        /* USB */
        AA17_730_USB_DM,
        W16_730_USB_PU_EN,
@@ -417,7 +417,15 @@ enum omap24xx_index {
        V15_24XX_MCBSP2_DX,
 
        /* 24xx GPIO */
+       M21_242X_GPIO11,
+       AA10_242X_GPIO13,
+       AA6_242X_GPIO14,
+       AA4_242X_GPIO15,
+       Y11_242X_GPIO16,
+       AA12_242X_GPIO17,
+       AA8_242X_GPIO58,
        Y20_24XX_GPIO60,
+       W4__24XX_GPIO74,
        M15_24XX_GPIO92,
        V14_24XX_GPIO117,