Merge branch 'next' of git://git.monstr.eu/linux-2.6-microblaze

[karo-tx-linux.git] / arch / arm / mach-tegra / board-paz00-pinmux.c

diff --git a/arch/arm/mach-tegra/board-paz00-pinmux.c b/arch/arm/mach-tegra/board-paz00-pinmux.c
index 2643d1bd568b50102231d93432178c297dc79b05..bdd2627dd87ba0acdde5eb29b254274808f09499 100644 (file)
--- a/arch/arm/mach-tegra/board-paz00-pinmux.c
+++ b/arch/arm/mach-tegra/board-paz00-pinmux.c
@@ -141,12 +141,10 @@ static struct tegra_pingroup_config paz00_pinmux[] = {
 };
 
 static struct tegra_gpio_table gpio_table[] = {
-       { .gpio = TEGRA_GPIO_SD1_CD,    .enable = true  },
-       { .gpio = TEGRA_GPIO_SD1_WP,    .enable = true  },
-       { .gpio = TEGRA_GPIO_SD1_POWER, .enable = true  },
-       { .gpio = TEGRA_GPIO_SD4_CD,    .enable = true  },
-       { .gpio = TEGRA_GPIO_SD4_WP,    .enable = true  },
-       { .gpio = TEGRA_GPIO_SD4_POWER, .enable = true  },
+       { .gpio = TEGRA_GPIO_SD1_CD,    .enable = true },
+       { .gpio = TEGRA_GPIO_SD1_WP,    .enable = true },
+       { .gpio = TEGRA_GPIO_SD1_POWER, .enable = true },
+       { .gpio = TEGRA_ULPI_RST,       .enable = true },
 };
 
 void paz00_pinmux_init(void)