From de2f1b95e0a86b0191151fb03da96a58931e600a Mon Sep 17 00:00:00 2001 From: Randy Dunlap Date: Wed, 6 Dec 2006 20:41:20 -0800 Subject: [PATCH] --- yaml --- r: 42979 b: refs/heads/master c: 1aa16eeacd6f10c202da1cf0cff5c81107dac942 h: refs/heads/master i: 42977: da832d1838cd3a93bb40206ff796543b248bef94 42975: 291a219f9536145659514a02f3cbb300b7e16b5a v: v3 --- [refs] | 2 +- trunk/drivers/char/ipmi/ipmi_msghandler.c | 2 ++ trunk/drivers/char/ipmi/ipmi_poweroff.c | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index d531e8befdd1..6a1cfe9b6ea4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5a1099baa86c17c521859f417c4c1353d0ae9096 +refs/heads/master: 1aa16eeacd6f10c202da1cf0cff5c81107dac942 diff --git a/trunk/drivers/char/ipmi/ipmi_msghandler.c b/trunk/drivers/char/ipmi/ipmi_msghandler.c index ff0e68f0386b..5703ee28e1cc 100644 --- a/trunk/drivers/char/ipmi/ipmi_msghandler.c +++ b/trunk/drivers/char/ipmi/ipmi_msghandler.c @@ -1769,6 +1769,7 @@ int ipmi_request_supply_msgs(ipmi_user_t user, -1, 0); } +#ifdef CONFIG_PROC_FS static int ipmb_file_read_proc(char *page, char **start, off_t off, int count, int *eof, void *data) { @@ -1857,6 +1858,7 @@ static int stat_file_read_proc(char *page, char **start, off_t off, return (out - ((char *) page)); } +#endif /* CONFIG_PROC_FS */ int ipmi_smi_add_proc_entry(ipmi_smi_t smi, char *name, read_proc_t *read_proc, write_proc_t *write_proc, diff --git a/trunk/drivers/char/ipmi/ipmi_poweroff.c b/trunk/drivers/char/ipmi/ipmi_poweroff.c index 8ce447ab6de5..597eb4f88b84 100644 --- a/trunk/drivers/char/ipmi/ipmi_poweroff.c +++ b/trunk/drivers/char/ipmi/ipmi_poweroff.c @@ -702,9 +702,9 @@ static int ipmi_poweroff_init (void) printk(KERN_ERR PFX "Unable to register SMI watcher: %d\n", rv); goto out_err; } -#endif out_err: +#endif return rv; }