[PATCH] sysctl: mips/au1000: remove sys_sysctl support

The assignment of binary numbers for sys_sysctl use was in shambles and
despite requiring methods.  Nothing was implemented on the sys_sysctl side.

So this patch gives a mercy killing to the sys_sysctl support for
powermanagment on mips/au1000.

Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
Acked-by: Ralf Baechle <ralf@linux-mips.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

1 files changed, 5 insertions, 11 deletions

diff --git a/arch/mips/au1000/common/power.c b/arch/mips/au1000/common/power.c
index 7504a636461..b531ab747c9 100644
--- a/arch/mips/au1000/common/power.c
+++ b/arch/mips/au1000/common/power.c
@@ -62,12 +62,6 @@ extern unsigned long save_local_and_disable(int controller);
 extern void restore_local_and_enable(int controller, unsigned long mask);
 extern void local_enable_irq(unsigned int irq_nr);
 
-/* Quick acpi hack. This will have to change! */
-#define CTL_ACPI 9999
-#define ACPI_S1_SLP_TYP 19
-#define ACPI_SLEEP 21
-
-
 static DEFINE_SPINLOCK(pm_lock);
 
 /* We need to save/restore a bunch of core registers that are
@@ -425,14 +419,14 @@ static int pm_do_freq(ctl_table * ctl, int write, struct file *file,
 
 
 static struct ctl_table pm_table[] = {
-        {ACPI_S1_SLP_TYP, "suspend", NULL, 0, 0600, NULL, &pm_do_suspend},
-        {ACPI_SLEEP, "sleep", NULL, 0, 0600, NULL, &pm_do_sleep},
-        {CTL_ACPI, "freq", NULL, 0, 0600, NULL, &pm_do_freq},
+        {CTL_UNNUMBERED, "suspend", NULL, 0, 0600, NULL, &pm_do_suspend},
+        {CTL_UNNUMBERED, "sleep", NULL, 0, 0600, NULL, &pm_do_sleep},
+        {CTL_UNNUMBERED, "freq", NULL, 0, 0600, NULL, &pm_do_freq},
         {0}
 };
 
 static struct ctl_table pm_dir_table[] = {
-        {CTL_ACPI, "pm", NULL, 0, 0555, pm_table},
+        {CTL_UNNUMBERED, "pm", NULL, 0, 0555, pm_table},
         {0}
 };
 
@@ -441,7 +435,7 @@ static struct ctl_table pm_dir_table[] = {
  */
 static int __init pm_init(void)
 {
-        register_sysctl_table(pm_dir_table, 1);
+        register_sysctl_table(pm_dir_table, 0);
         return 0;
 }