summaryrefslogtreecommitdiff
path: root/arch/mips/ite-boards/generic/it8172_setup.c
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@pobox.com>2006-02-09 08:59:34 +0300
committerJeff Garzik <jgarzik@pobox.com>2006-02-09 08:59:34 +0300
commit725b2805fd5d729b0db59fe8fc992e97523782c7 (patch)
tree04ca7c7ed6e918029898a6c5301488e60d0564d4 /arch/mips/ite-boards/generic/it8172_setup.c
parent9ac341ae799413708e674bc65c8a72c90dae8d34 (diff)
parentcac0e8e8bb2e7a086643bdd00c41d900a79bb4fa (diff)
downloadlinux-725b2805fd5d729b0db59fe8fc992e97523782c7.tar.xz
Merge branch 'upstream-fixes'
Diffstat (limited to 'arch/mips/ite-boards/generic/it8172_setup.c')
-rw-r--r--arch/mips/ite-boards/generic/it8172_setup.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/mips/ite-boards/generic/it8172_setup.c b/arch/mips/ite-boards/generic/it8172_setup.c
index 062429dd7ca0..fc73c8d69df7 100644
--- a/arch/mips/ite-boards/generic/it8172_setup.c
+++ b/arch/mips/ite-boards/generic/it8172_setup.c
@@ -34,6 +34,7 @@
#include <linux/major.h>
#include <linux/kdev_t.h>
#include <linux/root_dev.h>
+#include <linux/pm.h>
#include <asm/cpu.h>
#include <asm/time.h>
@@ -125,7 +126,7 @@ void __init plat_setup(void)
_machine_restart = it8172_restart;
_machine_halt = it8172_halt;
- _machine_power_off = it8172_power_off;
+ pm_power_off = it8172_power_off;
/*
* IO/MEM resources.