commit 2bfe94905d3601774c6418c020ba830c118578b4
author Tony Luck <tony.luck@intel.com> Tue Jun 07 11:29:43 2005 -0700
committer Tony Luck <tony.luck@intel.com> Tue Jun 07 11:29:43 2005 -0700
tree 49f908df283332371b74c4686dd2f0109db2bc61
parent 26abd53d8e9e51bbeea0b4772e8dffece3eeff38
parent 3f5948fa2cbbda1261eec9a39ef3004b3caf73fb

Auto merge with /home/aegl/GIT/linus

arch/ia64/sn/kernel/setup.c

diff --git a/arch/ia64/sn/kernel/setup.c b/arch/ia64/sn/kernel/setup.c
index e64cb81..44bfc7f 100644
--- a/arch/ia64/sn/kernel/setup.c
+++ b/arch/ia64/sn/kernel/setup.c
@@ -222,7 +222,7 @@
 
 extern int platform_intr_list[];
 extern nasid_t master_nasid;
-static int shub_1_1_found __initdata;
+static int __initdata shub_1_1_found = 0;
 
 /*
  * sn_check_for_wars
@@ -251,7 +251,7 @@
 	} else {
 		for_each_online_node(cnode) {
 			if (is_shub_1_1(cnodeid_to_nasid(cnode)))
-				sn_hub_info->shub_1_1_found = 1;
+				shub_1_1_found = 1;
 		}
 	}
 }