1 files changed, 0 insertions, 12 deletions
diff --git a/kernel/power/Kconfig b/kernel/power/Kconfig
index 495b7d4dd330..73328476761c 100644
--- a/kernel/power/Kconfig
+++ b/kernel/power/Kconfig
@@ -65,18 +65,6 @@ config PM_TRACE
        CAUTION: this option will cause your machine's real-time clock to be
        set to an invalid time after a resume.
-config PM_SYSFS_DEPRECATED
-        bool "Driver model /sys/devices/.../power/state files (DEPRECATED)"
-        depends on PM && SYSFS
-        default n
-        help
-          The driver model started out with a sysfs file intended to provide
-          a userspace hook for device power management.  This feature has never
-          worked very well, except for limited testing purposes, and so it will
-          be removed.   It's not clear that a generic mechanism could really
-          handle the wide variability of device power states; any replacements
-          are likely to be bus or driver specific.
 config SOFTWARE_SUSPEND
        bool "Software Suspend (Hibernation)"
        depends on PM && SWAP && (((X86 || PPC64_SWSUSP) && (!SMP || SUSPEND_SMP)) || ((FRV || PPC32) && !SMP))

diff --git a/kernel/power/Kconfig b/kernel/power/Kconfig index 495b7d4dd330..73328476761c 100644 --- a/kernel/power/Kconfig +++ b/kernel/power/Kconfig
@@ -65,18 +65,6 @@ config PM_TRACE
65	CAUTION: this option will cause your machine's real-time clock to be	65	CAUTION: this option will cause your machine's real-time clock to be
66	set to an invalid time after a resume.	66	set to an invalid time after a resume.
67		67
68	config PM_SYSFS_DEPRECATED
69	bool "Driver model /sys/devices/.../power/state files (DEPRECATED)"
70	depends on PM && SYSFS
71	default n
72	help
73	The driver model started out with a sysfs file intended to provide
74	a userspace hook for device power management. This feature has never
75	worked very well, except for limited testing purposes, and so it will
76	be removed. It's not clear that a generic mechanism could really
77	handle the wide variability of device power states; any replacements
78	are likely to be bus or driver specific.
79
80	config SOFTWARE_SUSPEND	68	config SOFTWARE_SUSPEND
81	bool "Software Suspend (Hibernation)"	69	bool "Software Suspend (Hibernation)"
82	depends on PM && SWAP && (((X86 \|\| PPC64_SWSUSP) && (!SMP \|\| SUSPEND_SMP)) \|\| ((FRV \|\| PPC32) && !SMP))	70	depends on PM && SWAP && (((X86 \|\| PPC64_SWSUSP) && (!SMP \|\| SUSPEND_SMP)) \|\| ((FRV \|\| PPC32) && !SMP))