linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / include / linux / ipmi.h

diff --git a/include/linux/ipmi.h b/include/linux/ipmi.h
index d09fbea..d6276e6 100644 (file)
--- a/include/linux/ipmi.h
+++ b/include/linux/ipmi.h
@@ -209,8 +209,11 @@ struct kernel_ipmi_msg
  */
 #include <linux/list.h>
 #include <linux/module.h>
-#include <linux/device.h>
+
+#ifdef CONFIG_PROC_FS
 #include <linux/proc_fs.h>
+extern struct proc_dir_entry *proc_ipmi_root;
+#endif /* CONFIG_PROC_FS */
 
 /* Opaque type for a IPMI message user.  One of these is needed to
    send and receive messages. */
@@ -394,7 +397,7 @@ struct ipmi_smi_watcher
           the watcher list.  So you can add and remove users from the
           IPMI interface, send messages, etc., but you cannot add
           or remove SMI watchers or SMI interfaces. */
-       void (*new_smi)(int if_num, struct device *dev);
+       void (*new_smi)(int if_num);
        void (*smi_gone)(int if_num);
 };