From c27965b3c991b2307717fc767c94411b34d236d9 Mon Sep 17 00:00:00 2001
From: Ralf Baechle <ralf@linux-mips.org>
Date: Thu, 1 Nov 2007 12:22:53 +0000
Subject: [PATCH] --- yaml --- r: 73017 b: refs/heads/master c:
 f5cd9f14e2660e610d8bb99ce723ef098b65ae9c h: refs/heads/master i:   73015:
 17e002ddfb8c98472bddc72c0448e5376d24ffae v: v3

---
 [refs]                                      | 2 +-
 trunk/arch/mips/au1000/pb1200/board_setup.c | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 803fd9fda900..73efc91a8084 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c8925297e875168a7c08965b4f80b418524fb8ce
+refs/heads/master: f5cd9f14e2660e610d8bb99ce723ef098b65ae9c
diff --git a/trunk/arch/mips/au1000/pb1200/board_setup.c b/trunk/arch/mips/au1000/pb1200/board_setup.c
index 5dbc9868f598..b98bebfa87c6 100644
--- a/trunk/arch/mips/au1000/pb1200/board_setup.c
+++ b/trunk/arch/mips/au1000/pb1200/board_setup.c
@@ -68,9 +68,11 @@ void board_reset(void)
 void __init board_setup(void)
 {
 	char *argptr = NULL;
-	u32 pin_func;
 
 #if 0
+	{
+	u32 pin_func;
+
 	/* Enable PSC1 SYNC for AC97.  Normaly done in audio driver,
 	 * but it is board specific code, so put it here.
 	 */
@@ -81,11 +83,13 @@ void __init board_setup(void)
 
 	au_writel(0, (u32)bcsr|0x10); /* turn off pcmcia power */
 	au_sync();
+	}
 #endif
 
 #if defined(CONFIG_I2C_AU1550)
 	{
 	u32 freq0, clksrc;
+	u32 pin_func;
 
 	/* Select SMBUS in CPLD */
 	bcsr->resets &= ~(BCSR_RESETS_PCS0MUX);