2 files changed, 1 insertions, 24 deletions

diff --git a/kernel/power/main.c b/kernel/power/main.c
index c74a56436d8b..32147b57c3bf 100644
--- a/kernel/power/main.c
+++ b/kernel/power/main.c
@@ -332,27 +332,6 @@ static ssize_t state_store(struct kset *kset, const char *buf, size_t n)
 
 power_attr(state);
 
-unsigned long s2ram_beep = 0;
-
-static ssize_t s2ram_beep_show(struct kset *kset, char *buf)
-{
-        return sprintf(buf, "%d\n", s2ram_beep);
-}
-
-static ssize_t
-s2ram_beep_store(struct kset *kset, const char *buf, size_t n)
-{
-        int val;
-
-        if (sscanf(buf, "%d", &val) > 0) {
-                s2ram_beep = val;
-                return n;
-        }
-        return -EINVAL;
-}
-
-power_attr(s2ram_beep);
-
 #ifdef CONFIG_PM_TRACE
 int pm_trace_enabled;
 
@@ -378,13 +357,11 @@ power_attr(pm_trace);
 static struct attribute * g[] = {
         &state_attr.attr,
         &pm_trace_attr.attr,
-        &s2ram_beep_attr.attr,
         NULL,
 };
 #else
 static struct attribute * g[] = {
         &state_attr.attr,
-        &s2ram_beep_attr.attr,
         NULL,
 };
 #endif /* CONFIG_PM_TRACE */
diff --git a/kernel/sysctl.c b/kernel/sysctl.c
index 44a1d699aad7..3ed4912bf183 100644
--- a/kernel/sysctl.c
+++ b/kernel/sysctl.c
@@ -660,7 +660,7 @@ static ctl_table kern_table[] = {
         {
                 .ctl_name       = KERN_ACPI_VIDEO_FLAGS,
                 .procname       = "acpi_video_flags",
-                .data           = &acpi_video_flags,
+                .data           = &acpi_realmode_flags,
                 .maxlen         = sizeof (unsigned long),
                 .mode           = 0644,
                 .proc_handler   = &proc_doulongvec_minmax,