Merge branch 'next' of git://github.com/kernelslacker/cpufreq

[pandora-kernel.git] / arch / arm / mach-davinci / include / mach / mux.h

diff --git a/arch/arm/mach-davinci/include/mach/mux.h b/arch/arm/mach-davinci/include/mach/mux.h
index 5d4e0fe..a7e92fc 100644 (file)
--- a/arch/arm/mach-davinci/include/mach/mux.h
+++ b/arch/arm/mach-davinci/include/mach/mux.h
@@ -857,6 +857,14 @@ enum davinci_da850_index {
        DA850_MMCSD0_CLK,
        DA850_MMCSD0_CMD,
 
+       /* MMC/SD1 function */
+       DA850_MMCSD1_DAT_0,
+       DA850_MMCSD1_DAT_1,
+       DA850_MMCSD1_DAT_2,
+       DA850_MMCSD1_DAT_3,
+       DA850_MMCSD1_CLK,
+       DA850_MMCSD1_CMD,
+
        /* EMIF2.5/EMIFA function */
        DA850_EMA_D_7,
        DA850_EMA_D_6,
@@ -916,6 +924,8 @@ enum davinci_da850_index {
        DA850_GPIO3_13,
        DA850_GPIO4_0,
        DA850_GPIO4_1,
+       DA850_GPIO6_9,
+       DA850_GPIO6_10,
        DA850_GPIO6_13,
        DA850_RTC_ALARM,
 };