diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-07 10:10:09 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-07 10:10:09 -0800 |
| commit | e8a82fd030c2e0ba4d4169cc4257ef174ff6f6b4 (patch) | |
| tree | 0515ffe68d9a88eda2d16f45e6391b05475fd9d1 /arch/mips/jmr3927/rbhma3100/setup.c | |
| parent | e1a8e6c9b757c09249ab29fc6da12d9ab64567e1 (diff) | |
| parent | b38c73995f63fe205c0068cb0ce3131895244068 (diff) | |
| download | blackbird-op-linux-e8a82fd030c2e0ba4d4169cc4257ef174ff6f6b4.tar.gz blackbird-op-linux-e8a82fd030c2e0ba4d4169cc4257ef174ff6f6b4.zip | |
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
Diffstat (limited to 'arch/mips/jmr3927/rbhma3100/setup.c')
| -rw-r--r-- | arch/mips/jmr3927/rbhma3100/setup.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/mips/jmr3927/rbhma3100/setup.c b/arch/mips/jmr3927/rbhma3100/setup.c index 4763957df8fc..9359cc413494 100644 --- a/arch/mips/jmr3927/rbhma3100/setup.c +++ b/arch/mips/jmr3927/rbhma3100/setup.c @@ -44,6 +44,7 @@ #include <linux/ioport.h> #include <linux/param.h> /* for HZ */ #include <linux/delay.h> +#include <linux/pm.h> #ifdef CONFIG_SERIAL_TXX9 #include <linux/tty.h> #include <linux/serial.h> @@ -211,7 +212,7 @@ void __init plat_setup(void) _machine_restart = jmr3927_machine_restart; _machine_halt = jmr3927_machine_halt; - _machine_power_off = jmr3927_machine_power_off; + pm_power_off = jmr3927_machine_power_off; /* * IO/MEM resources. |
