From 36583f9ca5e31a3f74fb345e56f3ef2d326930e2 Mon Sep 17 00:00:00 2001
From: Adrian Bunk <bunk@stusta.de>
Date: Mon, 9 Jan 2006 20:51:36 -0800
Subject: [PATCH] --- yaml --- r: 17535 b: refs/heads/master c:
 be4f1bb2627c2d963d09be1cd69f8820995a9112 h: refs/heads/master i:   17533:
 119a327f6aeb0fb7422e16bc2f102a20ccb50788   17531:
 7b858b28482053cbfe81f7da6aa239f966f715e9   17527:
 8667d6243a52b0300f49a4edf6268993ee2ea0e2   17519:
 4b373cb72777a246f2285b3a7be1495b087df01e   17503:
 d90b3fe351689a8b99480df8ecdeaa6c4c08f716   17471:
 c8f5f37877c96ee55def1dccfc847d236abc4480   17407:
 bd354ad2ecf8084b02b062002373b13966f0d560 v: v3

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

diff --git a/[refs] b/[refs]
index 395fa0007b2a..4b937ff42535 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9c107805aba774667debc01704718960339c24b9
+refs/heads/master: be4f1bb2627c2d963d09be1cd69f8820995a9112
diff --git a/trunk/drivers/char/ipmi/ipmi_msghandler.c b/trunk/drivers/char/ipmi/ipmi_msghandler.c
index 561430ed94af..0097f06fa67b 100644
--- a/trunk/drivers/char/ipmi/ipmi_msghandler.c
+++ b/trunk/drivers/char/ipmi/ipmi_msghandler.c
@@ -57,6 +57,7 @@ static int initialized = 0;
 
 #ifdef CONFIG_PROC_FS
 struct proc_dir_entry *proc_ipmi_root = NULL;
+EXPORT_SYMBOL(proc_ipmi_root);
 #endif /* CONFIG_PROC_FS */
 
 #define MAX_EVENTS_IN_QUEUE	25
@@ -3295,6 +3296,5 @@ EXPORT_SYMBOL(ipmi_get_my_address);
 EXPORT_SYMBOL(ipmi_set_my_LUN);
 EXPORT_SYMBOL(ipmi_get_my_LUN);
 EXPORT_SYMBOL(ipmi_smi_add_proc_entry);
-EXPORT_SYMBOL(proc_ipmi_root);
 EXPORT_SYMBOL(ipmi_user_set_run_to_completion);
 EXPORT_SYMBOL(ipmi_free_recv_msg);
diff --git a/trunk/drivers/char/ipmi/ipmi_poweroff.c b/trunk/drivers/char/ipmi/ipmi_poweroff.c
index e053eade0366..49c09ae004bf 100644
--- a/trunk/drivers/char/ipmi/ipmi_poweroff.c
+++ b/trunk/drivers/char/ipmi/ipmi_poweroff.c
@@ -612,11 +612,14 @@ static int ipmi_poweroff_init (void)
 #endif
 
 	rv = ipmi_smi_watcher_register(&smi_watcher);
+
+#ifdef CONFIG_PROC_FS
 	if (rv) {
 		unregister_sysctl_table(ipmi_table_header);
 		printk(KERN_ERR PFX "Unable to register SMI watcher: %d\n", rv);
 		goto out_err;
 	}
+#endif
 
  out_err:
 	return rv;