diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2006-02-07 23:16:27 +0300 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2006-02-07 23:16:27 +0300 |
| commit | 5d1769ac3d0ea5ff3a286b097c21faaf6a9e6859 (patch) | |
| tree | 63429c2222a55509dc81269233bbe7a321bb86ed /arch/mips/ddb5xxx/ddb5476 | |
| parent | 23a56e2cbec2860ef02d6720508fbcb07accc8b4 (diff) | |
| parent | ce4b50f2fc62267eeaf331c41bc11b92d9bc7865 (diff) | |
| download | linux-5d1769ac3d0ea5ff3a286b097c21faaf6a9e6859.tar.xz | |
Merge branch 'master'
Diffstat (limited to 'arch/mips/ddb5xxx/ddb5476')
| -rw-r--r-- | arch/mips/ddb5xxx/ddb5476/setup.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/mips/ddb5xxx/ddb5476/setup.c b/arch/mips/ddb5xxx/ddb5476/setup.c index f4e480a74edf..c902adef5942 100644 --- a/arch/mips/ddb5xxx/ddb5476/setup.c +++ b/arch/mips/ddb5xxx/ddb5476/setup.c @@ -11,6 +11,7 @@ #include <linux/types.h> #include <linux/sched.h> #include <linux/pci.h> +#include <linux/pm.h> #include <asm/addrspace.h> #include <asm/bcache.h> @@ -133,7 +134,7 @@ void __init plat_setup(void) _machine_restart = ddb_machine_restart; _machine_halt = ddb_machine_halt; - _machine_power_off = ddb_machine_power_off; + pm_power_off = ddb_machine_power_off; /* request io port/mem resources */ if (request_resource(&ioport_resource, &ddb5476_ioport.dma1) || |