aboutsummaryrefslogtreecommitdiff
path: root/drivers/base/power/Makefile
diff options
context:
space:
mode:
authorDaniel Drake <dsd@gentoo.org>2007-11-21 14:55:18 -0800
committerGreg Kroah-Hartman <gregkh@suse.de>2007-11-28 13:53:53 -0800
commitdec13c15445fec29ca9087890895718450e80b95 (patch)
treecac4cfb2d665344973cb4d953d3d7785ae612a0d /drivers/base/power/Makefile
parent345ee8392dc149ca529f80e40583928977ad592e (diff)
downloadlinux-2.6.34-ux500-dec13c15445fec29ca9087890895718450e80b95.tar.gz
create /sys/.../power when CONFIG_PM is set
The CONFIG_SUSPEND changes in 2.6.23 caused a regression under certain configuration conditions (SUSPEND=n, USB_AUTOSUSPEND=y) where all USB device attributes in sysfs (idVendor, idProduct, ...) silently disappeared, causing udev breakage and more. The cause of this is that the /sys/.../power subdirectory is now only created when CONFIG_PM_SLEEP is set, however, it should be created whenever CONFIG_PM is set to handle the above situation. The following patch fixes the regression. Signed-off-by: Daniel Drake <dsd@gentoo.org> Acked-by: Rafael J. Wysocki <rjw@sisk.pl> Cc: Alan Stern <stern@rowland.harvard.edu> Cc: Kay Sievers <kay.sievers@vrfy.org> Cc: stable <stable@kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/base/power/Makefile')
-rw-r--r--drivers/base/power/Makefile3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/base/power/Makefile b/drivers/base/power/Makefile
index a803733c839..44504e6618f 100644
--- a/drivers/base/power/Makefile
+++ b/drivers/base/power/Makefile
@@ -1,5 +1,6 @@
obj-y := shutdown.o
-obj-$(CONFIG_PM_SLEEP) += main.o sysfs.o
+obj-$(CONFIG_PM) += sysfs.o
+obj-$(CONFIG_PM_SLEEP) += main.o
obj-$(CONFIG_PM_TRACE) += trace.o
ifeq ($(CONFIG_DEBUG_DRIVER),y)