From 7a366ac090d69235a7194531da1655e5e60edaf3 Mon Sep 17 00:00:00 2001
From: Anton Vorontsov <avorontsov@ru.mvista.com>
Date: Wed, 3 Dec 2008 22:27:52 +0300
Subject: [PATCH] --- yaml --- r: 127647 b: refs/heads/master c:
 78c7705037ed9f107660178e17aa73f8bc4127e8 h: refs/heads/master i:   127645:
 41354a31578124c33dfc511e174e9d6d953168cb   127643:
 c95a1be42c6c53d92b8d19a9e653a41776d4b731   127639:
 844ada9a9bad87ca177f01162d29105af91a91c3   127631:
 65ee349d51f2b372c2ac33af9a5d89c20a440b0f   127615:
 364791cb5f622d48a8a50389c463b009b6e7cd79 v: v3

---
 [refs]                                          | 2 +-
 trunk/arch/powerpc/platforms/83xx/mpc836x_mds.c | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 8bda471f03da..10e272503d5a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 81b36a0b6ea97c5c2f59e504c56e5a57ee26884a
+refs/heads/master: 78c7705037ed9f107660178e17aa73f8bc4127e8
diff --git a/trunk/arch/powerpc/platforms/83xx/mpc836x_mds.c b/trunk/arch/powerpc/platforms/83xx/mpc836x_mds.c
index 9d46e5bdd101..c0a09c34956b 100644
--- a/trunk/arch/powerpc/platforms/83xx/mpc836x_mds.c
+++ b/trunk/arch/powerpc/platforms/83xx/mpc836x_mds.c
@@ -18,6 +18,7 @@
 
 #include <linux/stddef.h>
 #include <linux/kernel.h>
+#include <linux/compiler.h>
 #include <linux/init.h>
 #include <linux/errno.h>
 #include <linux/reboot.h>
@@ -55,8 +56,6 @@
 #define DBG(fmt...)
 #endif
 
-static u8 *bcsr_regs = NULL;
-
 /* ************************************************************************
  *
  * Setup the architecture
@@ -65,13 +64,14 @@ static u8 *bcsr_regs = NULL;
 static void __init mpc836x_mds_setup_arch(void)
 {
 	struct device_node *np;
+	u8 __iomem *bcsr_regs = NULL;
 
 	if (ppc_md.progress)
 		ppc_md.progress("mpc836x_mds_setup_arch()", 0);
 
 	/* Map BCSR area */
 	np = of_find_node_by_name(NULL, "bcsr");
-	if (np != 0) {
+	if (np) {
 		struct resource res;
 
 		of_address_to_resource(np, 0, &res);