Merge branch 'devel-stable' of master.kernel.org:/home/rmk/linux-2.6-arm

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / kernel / power / Makefile

diff --git a/kernel/power/Makefile b/kernel/power/Makefile
index b75597235d85fd3323c318f5c58bb8c04554f1fb..c350e18b53e3f4d5f7683680634de3f2bf1bf3a3 100644 (file)
--- a/kernel/power/Makefile
+++ b/kernel/power/Makefile
@@ -7,6 +7,5 @@ obj-$(CONFIG_SUSPEND)           += suspend.o
 obj-$(CONFIG_PM_TEST_SUSPEND)  += suspend_test.o
 obj-$(CONFIG_HIBERNATION)      += hibernate.o snapshot.o swap.o user.o \
                                   block_io.o
-obj-$(CONFIG_SUSPEND_NVS)      += nvs.o
 
 obj-$(CONFIG_MAGIC_SYSRQ)      += poweroff.o