From 224362151bb7d1eee647df769cbcc3da84d37233 Mon Sep 17 00:00:00 2001
From: Florian Fainelli <florian@openwrt.org>
Date: Sun, 18 Oct 2009 16:04:09 +0200
Subject: [PATCH] --- yaml --- r: 182030 b: refs/heads/master c:
 32fc0adeb89c7e1e592bf31b7158ddc154298207 h: refs/heads/master v: v3

---
 [refs]                                                 | 2 +-
 trunk/arch/mips/alchemy/devboards/db1x00/board_setup.c | 4 +++-
 trunk/arch/mips/alchemy/devboards/pb1000/board_setup.c | 6 +++++-
 trunk/arch/mips/alchemy/devboards/pb1550/board_setup.c | 5 ++---
 4 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 08f24e9e9f02..e0e6166fd683 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 66a1d9baf4962defb3fc41439e3a22e752182f9f
+refs/heads/master: 32fc0adeb89c7e1e592bf31b7158ddc154298207
diff --git a/trunk/arch/mips/alchemy/devboards/db1x00/board_setup.c b/trunk/arch/mips/alchemy/devboards/db1x00/board_setup.c
index 64eb26ffd088..7aee14d78eea 100644
--- a/trunk/arch/mips/alchemy/devboards/db1x00/board_setup.c
+++ b/trunk/arch/mips/alchemy/devboards/db1x00/board_setup.c
@@ -85,12 +85,14 @@ void board_reset(void)
 void __init board_setup(void)
 {
 	unsigned long bcsr1, bcsr2;
-	u32 pin_func = 0;
+	u32 pin_func;
 	char *argptr;
 
 	bcsr1 = DB1000_BCSR_PHYS_ADDR;
 	bcsr2 = DB1000_BCSR_PHYS_ADDR + DB1000_BCSR_HEXLED_OFS;
 
+	pin_func = 0;
+
 #ifdef CONFIG_MIPS_DB1000
 	printk(KERN_INFO "AMD Alchemy Au1000/Db1000 Board\n");
 #endif
diff --git a/trunk/arch/mips/alchemy/devboards/pb1000/board_setup.c b/trunk/arch/mips/alchemy/devboards/pb1000/board_setup.c
index 287d661827eb..50fff504ae05 100644
--- a/trunk/arch/mips/alchemy/devboards/pb1000/board_setup.c
+++ b/trunk/arch/mips/alchemy/devboards/pb1000/board_setup.c
@@ -46,9 +46,13 @@ void __init board_setup(void)
 	u32 pin_func, static_cfg0;
 	u32 sys_freqctrl, sys_clksrc;
 	u32 prid = read_c0_prid();
+	char *argptr;
+
+	sys_freqctrl = 0;
+	sys_clksrc = 0;
+	argptr = prom_getcmdline();
 
 #ifdef CONFIG_SERIAL_8250_CONSOLE
-	char *argptr = prom_getcmdline();
 	argptr = strstr(argptr, "console=");
 	if (argptr == NULL) {
 		argptr = prom_getcmdline();
diff --git a/trunk/arch/mips/alchemy/devboards/pb1550/board_setup.c b/trunk/arch/mips/alchemy/devboards/pb1550/board_setup.c
index bb41740fecf5..0d060c3dd6f8 100644
--- a/trunk/arch/mips/alchemy/devboards/pb1550/board_setup.c
+++ b/trunk/arch/mips/alchemy/devboards/pb1550/board_setup.c
@@ -56,14 +56,13 @@ void board_reset(void)
 void __init board_setup(void)
 {
 	u32 pin_func;
+	char *argptr;
 
 	bcsr_init(PB1550_BCSR_PHYS_ADDR,
 		  PB1550_BCSR_PHYS_ADDR + PB1550_BCSR_HEXLED_OFS);
 
-
-#ifdef CONFIG_SERIAL_8250_CONSOLE
-	char *argptr;
 	argptr = prom_getcmdline();
+#ifdef CONFIG_SERIAL_8250_CONSOLE
 	argptr = strstr(argptr, "console=");
 	if (argptr == NULL) {
 		argptr = prom_getcmdline();