From 2d982a2153fa2c38f3b44e0a1ebd6d9edd41ccd9 Mon Sep 17 00:00:00 2001
From: Randy Dunlap <randy.dunlap@oracle.com>
Date: Wed, 27 Jun 2007 14:09:49 -0700
Subject: [PATCH] --- yaml --- r: 58081 b: refs/heads/master c:
 80581c43d02f66afb2cafa44bef710a2549a1748 h: refs/heads/master i:   58079:
 249547afedae42b34b58ed6985e39d2b513f21af v: v3

---
 [refs]                                  | 2 +-
 trunk/arch/i386/kernel/cpu/mtrr/cyrix.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 966839219ee1..a307705e546a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d2fd89962cd5de6b1fb9c1c789b56bc16f58f121
+refs/heads/master: 80581c43d02f66afb2cafa44bef710a2549a1748
diff --git a/trunk/arch/i386/kernel/cpu/mtrr/cyrix.c b/trunk/arch/i386/kernel/cpu/mtrr/cyrix.c
index 9edf5625584f..1001f1e0fe6d 100644
--- a/trunk/arch/i386/kernel/cpu/mtrr/cyrix.c
+++ b/trunk/arch/i386/kernel/cpu/mtrr/cyrix.c
@@ -233,12 +233,12 @@ typedef struct {
 	mtrr_type type;
 } arr_state_t;
 
-static arr_state_t arr_state[8] __devinitdata = {
+static arr_state_t arr_state[8] = {
 	{0UL, 0UL, 0UL}, {0UL, 0UL, 0UL}, {0UL, 0UL, 0UL}, {0UL, 0UL, 0UL},
 	{0UL, 0UL, 0UL}, {0UL, 0UL, 0UL}, {0UL, 0UL, 0UL}, {0UL, 0UL, 0UL}
 };
 
-static unsigned char ccr_state[7] __devinitdata = { 0, 0, 0, 0, 0, 0, 0 };
+static unsigned char ccr_state[7] = { 0, 0, 0, 0, 0, 0, 0 };
 
 static void cyrix_set_all(void)
 {