diff options
Diffstat (limited to 'arch/mips/au1000/common/power.c')
-rw-r--r-- | arch/mips/au1000/common/power.c | 16 |
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); | |||
62 | extern void restore_local_and_enable(int controller, unsigned long mask); | 62 | extern void restore_local_and_enable(int controller, unsigned long mask); |
63 | extern void local_enable_irq(unsigned int irq_nr); | 63 | extern void local_enable_irq(unsigned int irq_nr); |
64 | 64 | ||
65 | /* Quick acpi hack. This will have to change! */ | ||
66 | #define CTL_ACPI 9999 | ||
67 | #define ACPI_S1_SLP_TYP 19 | ||
68 | #define ACPI_SLEEP 21 | ||
69 | |||
70 | |||
71 | static DEFINE_SPINLOCK(pm_lock); | 65 | static DEFINE_SPINLOCK(pm_lock); |
72 | 66 | ||
73 | /* We need to save/restore a bunch of core registers that are | 67 | /* 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, | |||
425 | 419 | ||
426 | 420 | ||
427 | static struct ctl_table pm_table[] = { | 421 | static struct ctl_table pm_table[] = { |
428 | {ACPI_S1_SLP_TYP, "suspend", NULL, 0, 0600, NULL, &pm_do_suspend}, | 422 | {CTL_UNNUMBERED, "suspend", NULL, 0, 0600, NULL, &pm_do_suspend}, |
429 | {ACPI_SLEEP, "sleep", NULL, 0, 0600, NULL, &pm_do_sleep}, | 423 | {CTL_UNNUMBERED, "sleep", NULL, 0, 0600, NULL, &pm_do_sleep}, |
430 | {CTL_ACPI, "freq", NULL, 0, 0600, NULL, &pm_do_freq}, | 424 | {CTL_UNNUMBERED, "freq", NULL, 0, 0600, NULL, &pm_do_freq}, |
431 | {0} | 425 | {0} |
432 | }; | 426 | }; |
433 | 427 | ||
434 | static struct ctl_table pm_dir_table[] = { | 428 | static struct ctl_table pm_dir_table[] = { |
435 | {CTL_ACPI, "pm", NULL, 0, 0555, pm_table}, | 429 | {CTL_UNNUMBERED, "pm", NULL, 0, 0555, pm_table}, |
436 | {0} | 430 | {0} |
437 | }; | 431 | }; |
438 | 432 | ||
@@ -441,7 +435,7 @@ static struct ctl_table pm_dir_table[] = { | |||
441 | */ | 435 | */ |
442 | static int __init pm_init(void) | 436 | static int __init pm_init(void) |
443 | { | 437 | { |
444 | register_sysctl_table(pm_dir_table, 1); | 438 | register_sysctl_table(pm_dir_table, 0); |
445 | return 0; | 439 | return 0; |
446 | } | 440 | } |
447 | 441 | ||