auto merge with /home/aegl/GIT/linus
authorTony Luck <tony.luck@intel.com>
Mon, 6 Jun 2005 22:42:07 +0000 (15:42 -0700)
committerTony Luck <tony.luck@intel.com>
Mon, 6 Jun 2005 22:42:07 +0000 (15:42 -0700)
arch/ia64/sn/kernel/setup.c

index e64cb8175f7a7450becd3ff9962ab348b80780d1..44bfc7f318cbd611752fcede5459ee3182807191 100644 (file)
@@ -222,7 +222,7 @@ void __init early_sn_setup(void)
 
 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 @@ static void __init sn_check_for_wars(void)
        } 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;
                }
        }
 }