diff options
| author | Steve French <sfrench@us.ibm.com> | 2006-02-10 16:53:29 +0000 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2006-02-10 16:53:29 +0000 |
| commit | b580513e841d81eebf0d7b02f412be0882c2ce5f (patch) | |
| tree | 9336a14058eed66c335db10512f33a31f9e8c938 /arch/mips/mips-boards/generic/reset.c | |
| parent | 04fdabe17c4840a4cd84c3589f20f5d4689b1ec5 (diff) | |
| parent | 418aade459f03318defd18ef0b11981a63bd81b0 (diff) | |
| download | linux-b580513e841d81eebf0d7b02f412be0882c2ce5f.tar.gz linux-b580513e841d81eebf0d7b02f412be0882c2ce5f.tar.bz2 linux-b580513e841d81eebf0d7b02f412be0882c2ce5f.zip | |
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Signed-off-by: Steve French <sfrench@us.ibm.com>
Diffstat (limited to 'arch/mips/mips-boards/generic/reset.c')
| -rw-r--r-- | arch/mips/mips-boards/generic/reset.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/mips/mips-boards/generic/reset.c b/arch/mips/mips-boards/generic/reset.c index 9fdec743bd95..7213c395fb6b 100644 --- a/arch/mips/mips-boards/generic/reset.c +++ b/arch/mips/mips-boards/generic/reset.c @@ -23,6 +23,7 @@ * */ #include <linux/config.h> +#include <linux/pm.h> #include <asm/io.h> #include <asm/reboot.h> @@ -65,9 +66,9 @@ void mips_reboot_setup(void) _machine_restart = mips_machine_restart; _machine_halt = mips_machine_halt; #if defined(CONFIG_MIPS_ATLAS) - _machine_power_off = atlas_machine_power_off; + pm_power_off = atlas_machine_power_off; #endif #if defined(CONFIG_MIPS_MALTA) || defined(CONFIG_MIPS_SEAD) - _machine_power_off = mips_machine_halt; + pm_power_off = mips_machine_halt; #endif } |