3 files changed, 12 insertions, 1 deletions

diff --git a/kernel/power/Kconfig b/kernel/power/Kconfig
index 46a5e5acff..5ec248cb7f 100644
--- a/kernel/power/Kconfig
+++ b/kernel/power/Kconfig
@@ -19,6 +19,15 @@ config PM
           will issue the hlt instruction if nothing is to be done, thereby
           sending the processor to sleep and saving power.
 
+config PM_LEGACY
+        bool "Legacy Power Management API"
+        depends on PM
+        default y
+        ---help---
+           Support for pm_register() and friends.
+
+           If unsure, say Y.
+
 config PM_DEBUG
         bool "Power Management Debug Support"
         depends on PM
diff --git a/kernel/power/Makefile b/kernel/power/Makefile
index c71eb4579c..04be7d0d96 100644
--- a/kernel/power/Makefile
+++ b/kernel/power/Makefile
@@ -3,7 +3,8 @@ ifeq ($(CONFIG_PM_DEBUG),y)
 EXTRA_CFLAGS    +=      -DDEBUG
 endif
 
-obj-y                           := main.o process.o console.o pm.o
+obj-y                           := main.o process.o console.o
+obj-$(CONFIG_PM_LEGACY)         += pm.o
 obj-$(CONFIG_SOFTWARE_SUSPEND)  += swsusp.o disk.o snapshot.o
 
 obj-$(CONFIG_SUSPEND_SMP)       += smp.o
diff --git a/kernel/power/pm.c b/kernel/power/pm.c
index 159149321b..33c508e857 100644
--- a/kernel/power/pm.c
+++ b/kernel/power/pm.c
@@ -23,6 +23,7 @@
 #include <linux/mm.h>
 #include <linux/slab.h>
 #include <linux/pm.h>
+#include <linux/pm_legacy.h>
 #include <linux/interrupt.h>
 
 int pm_active;