From ea5a1b44f9bb69f1985afc03049c722473b1583e Mon Sep 17 00:00:00 2001
From: Nicolas Pitre <nico@fluxnic.net>
Date: Mon, 21 Jun 2010 23:29:28 -0400
Subject: [PATCH] --- yaml --- r: 201514 b: refs/heads/master c:
 6f2b186a0f1e70be411ca260d4577f1ed35d58e0 h: refs/heads/master v: v3

---
 [refs]                                     |  2 +-
 trunk/arch/arm/mach-kirkwood/t5325-setup.c | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index f831e3866148..7d3a20153501 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b529ee4acfc65ecf4517ad4f22023d6a58e671a6
+refs/heads/master: 6f2b186a0f1e70be411ca260d4577f1ed35d58e0
diff --git a/trunk/arch/arm/mach-kirkwood/t5325-setup.c b/trunk/arch/arm/mach-kirkwood/t5325-setup.c
index ad1e0f1fb1e7..6a94daa04ca2 100644
--- a/trunk/arch/arm/mach-kirkwood/t5325-setup.c
+++ b/trunk/arch/arm/mach-kirkwood/t5325-setup.c
@@ -114,8 +114,8 @@ static unsigned int hp_t5325_mpp_config[] __initdata = {
 	MPP5_NF_IO7,
 	MPP6_SYSRST_OUTn,
 	MPP7_SPI_SCn,
-	MPP8_TW_SDA,
-	MPP9_TW_SCK,
+	MPP8_TW0_SDA,
+	MPP9_TW0_SCK,
 	MPP10_UART0_TXD,
 	MPP11_UART0_RXD,
 	MPP12_SD_CLK,
@@ -131,11 +131,11 @@ static unsigned int hp_t5325_mpp_config[] __initdata = {
 	MPP22_GPIO,
 	MPP23_GPIO,
 	MPP32_GPIO,
-	MPP33_GE1_13,
-	MPP39_AUDIO_I2SBCLK,
-	MPP40_AUDIO_I2SDO,
-	MPP41_AUDIO_I2SLRC,
-	MPP42_AUDIO_I2SMCLK,
+	MPP33_GE1_TXCTL,
+	MPP39_AU_I2SBCLK,
+	MPP40_AU_I2SDO,
+	MPP41_AU_I2SLRCLK,
+	MPP42_AU_I2SMCLK,
 	MPP45_GPIO,		/* Power button */
 	MPP48_GPIO,		/* Board power off */
 	0