Merge commit 'v2.6.30-rc1' into sched/urgent

[mirror_ubuntu-zesty-kernel.git] / include / linux / ipmi_smi.h

diff --git a/include/linux/ipmi_smi.h b/include/linux/ipmi_smi.h
index 845a8473ee5dccdf272d63a81d444aa05fd0fff2..f7c9c75a277547e7a6e8278d6f4da77a62eb3746 100644 (file)
--- a/include/linux/ipmi_smi.h
+++ b/include/linux/ipmi_smi.h
@@ -229,7 +229,7 @@ static inline void ipmi_free_smi_msg(struct ipmi_smi_msg *msg)
    directory for this interface.  Note that the entry will
    automatically be dstroyed when the interface is destroyed. */
 int ipmi_smi_add_proc_entry(ipmi_smi_t smi, char *name,
-                           read_proc_t *read_proc, write_proc_t *write_proc,
-                           void *data, struct module *owner);
+                           read_proc_t *read_proc,
+                           void *data);
 
 #endif /* __LINUX_IPMI_SMI_H */