diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-02-28 00:35:24 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-02-28 00:35:24 -0500 |
| commit | 6749c5507388f3fc3719f57a54b540ee83f6661a (patch) | |
| tree | c069f990f86b020a14b50759d0c75475eedde186 /arch/i386/mach-voyager/voyager_basic.c | |
| parent | 2cf82c0256b198ae28c465f2c4d7c12c836ea5ea (diff) | |
| parent | 56ec6462af9cba56a04439154e5768672d6f390f (diff) | |
Merge ../powerpc-merge
Diffstat (limited to 'arch/i386/mach-voyager/voyager_basic.c')
| -rw-r--r-- | arch/i386/mach-voyager/voyager_basic.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/i386/mach-voyager/voyager_basic.c b/arch/i386/mach-voyager/voyager_basic.c index aa49a33a572c..b584060ec004 100644 --- a/arch/i386/mach-voyager/voyager_basic.c +++ b/arch/i386/mach-voyager/voyager_basic.c | |||
| @@ -23,6 +23,8 @@ | |||
| 23 | #include <linux/delay.h> | 23 | #include <linux/delay.h> |
| 24 | #include <linux/reboot.h> | 24 | #include <linux/reboot.h> |
| 25 | #include <linux/sysrq.h> | 25 | #include <linux/sysrq.h> |
| 26 | #include <linux/smp.h> | ||
| 27 | #include <linux/nodemask.h> | ||
| 26 | #include <asm/io.h> | 28 | #include <asm/io.h> |
| 27 | #include <asm/voyager.h> | 29 | #include <asm/voyager.h> |
| 28 | #include <asm/vic.h> | 30 | #include <asm/vic.h> |
| @@ -328,4 +330,3 @@ void machine_power_off(void) | |||
| 328 | if (pm_power_off) | 330 | if (pm_power_off) |
| 329 | pm_power_off(); | 331 | pm_power_off(); |
| 330 | } | 332 | } |
| 331 | |||