Merge branches 'pm-sleep' and 'pm-cpufreq'

[mirror_ubuntu-zesty-kernel.git] / kernel / power / hibernate.c

diff --git a/kernel/power/hibernate.c b/kernel/power/hibernate.c
index 61761aa7cc193e62fdebc026f8ed5ff5cbd0d02d..33c79b6105c55fdc4f228bb0348fbc2b92d68f0f 100644 (file)
--- a/kernel/power/hibernate.c
+++ b/kernel/power/hibernate.c
@@ -1189,11 +1189,6 @@ static int __init nohibernate_setup(char *str)
        return 1;
 }
 
-static int __init kaslr_nohibernate_setup(char *str)
-{
-       return nohibernate_setup(str);
-}
-
 static int __init page_poison_nohibernate_setup(char *str)
 {
 #ifdef CONFIG_PAGE_POISONING_ZERO
@@ -1217,5 +1212,4 @@ __setup("hibernate=", hibernate_setup);
 __setup("resumewait", resumewait_setup);
 __setup("resumedelay=", resumedelay_setup);
 __setup("nohibernate", nohibernate_setup);
-__setup("kaslr", kaslr_nohibernate_setup);
 __setup("page_poison=", page_poison_nohibernate_setup);