From 4e78a4331ec27d455c5db96bc89e62a65ee3f6ed Mon Sep 17 00:00:00 2001
From: Randy Dunlap <rdunlap@xenotime.net>
Date: Tue, 18 Apr 2006 22:21:52 -0700
Subject: [PATCH] --- yaml --- r: 25999 b: refs/heads/master c:
 7420884c038f326bdac3a8ded856033523e7684e h: refs/heads/master i:   25997:
 e7d6bc977252f157966b0dbb72da9ff714d73985   25995:
 f753202b61029c5e2cb42ce8b542cab6b23a9bae   25991:
 d00cd1b4269fd183f55b2eb5be4ce2c06ef2fb18   25983:
 fb41147b9b46147f0e34d7ca91775604b8f10426 v: v3

---
 [refs]                                 | 2 +-
 trunk/drivers/char/ipmi/ipmi_si_intf.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 522f5b7feb3f..5ed8584315bd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5e1222717932ff7d447af6da03c10a81fb60af7d
+refs/heads/master: 7420884c038f326bdac3a8ded856033523e7684e
diff --git a/trunk/drivers/char/ipmi/ipmi_si_intf.c b/trunk/drivers/char/ipmi/ipmi_si_intf.c
index a86c0f29953e..b36eef0e9d19 100644
--- a/trunk/drivers/char/ipmi/ipmi_si_intf.c
+++ b/trunk/drivers/char/ipmi/ipmi_si_intf.c
@@ -2198,11 +2198,11 @@ static inline void wait_for_timer_and_thread(struct smi_info *smi_info)
 	}
 }
 
-static struct ipmi_default_vals
+static __devinitdata struct ipmi_default_vals
 {
 	int type;
 	int port;
-} __devinit ipmi_defaults[] =
+} ipmi_defaults[] =
 {
 	{ .type = SI_KCS, .port = 0xca2 },
 	{ .type = SI_SMIC, .port = 0xca9 },