Message ID | 201105070050.55235.rjw@sisk.pl (mailing list archive) |
---|---|
State | Accepted, archived |
Headers | show |
On Sat, May 07, 2011 at 12:50:55AM +0200, Rafael J. Wysocki wrote: > From: Rafael J. Wysocki <rjw@sisk.pl> > > The "wakeup" device sysfs file is only created if CONFIG_PM_SLEEP > is set, so put it under CONFIG_PM_SLEEP and make a build warning > related to it go away. > > Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl> Acked-by: Greg Kroah-Hartman <gregkh@suse.de>
On Sat 2011-05-07 00:50:55, Rafael J. Wysocki wrote: > From: Rafael J. Wysocki <rjw@sisk.pl> > > The "wakeup" device sysfs file is only created if CONFIG_PM_SLEEP > is set, so put it under CONFIG_PM_SLEEP and make a build warning > related to it go away. > > Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl> ack.
Index: linux-2.6/drivers/base/power/sysfs.c =================================================================== --- linux-2.6.orig/drivers/base/power/sysfs.c +++ linux-2.6/drivers/base/power/sysfs.c @@ -212,8 +212,9 @@ static ssize_t autosuspend_delay_ms_stor static DEVICE_ATTR(autosuspend_delay_ms, 0644, autosuspend_delay_ms_show, autosuspend_delay_ms_store); -#endif +#endif /* CONFIG_PM_RUNTIME */ +#ifdef CONFIG_PM_SLEEP static ssize_t wake_show(struct device * dev, struct device_attribute *attr, char * buf) { @@ -248,7 +249,6 @@ wake_store(struct device * dev, struct d static DEVICE_ATTR(wakeup, 0644, wake_show, wake_store); -#ifdef CONFIG_PM_SLEEP static ssize_t wakeup_count_show(struct device *dev, struct device_attribute *attr, char *buf) {