diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2006-02-09 05:58:59 (GMT) |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2006-02-09 05:58:59 (GMT) |
| commit | cac0e8e8bb2e7a086643bdd00c41d900a79bb4fa (patch) | |
| tree | 73cd85e5529a01fa2338ab6d58b99c36dd666cbe /arch/mips/ddb5xxx/ddb5074/setup.c | |
| parent | ddef9bb367b19383df627e388cb4c01c86ddba6c (diff) | |
| parent | 0bdd340c092b0936f78a54bdbd3927463ed4fca3 (diff) | |
| download | linux-cac0e8e8bb2e7a086643bdd00c41d900a79bb4fa.tar.xz | |
Merge branch 'master'
Diffstat (limited to 'arch/mips/ddb5xxx/ddb5074/setup.c')
| -rw-r--r-- | arch/mips/ddb5xxx/ddb5074/setup.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/mips/ddb5xxx/ddb5074/setup.c b/arch/mips/ddb5xxx/ddb5074/setup.c index 11535be..91456b0 100644 --- a/arch/mips/ddb5xxx/ddb5074/setup.c +++ b/arch/mips/ddb5xxx/ddb5074/setup.c @@ -14,6 +14,7 @@ #include <linux/ide.h> #include <linux/ioport.h> #include <linux/irq.h> +#include <linux/pm.h> #include <asm/addrspace.h> #include <asm/bcache.h> @@ -95,7 +96,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; ddb_out32(DDB_BAR0, 0); |