diff options
Diffstat (limited to 'arch/i386/kernel')
-rw-r--r-- | arch/i386/kernel/reboot.c | 6 | ||||
-rw-r--r-- | arch/i386/kernel/reboot_fixups.c | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/arch/i386/kernel/reboot.c b/arch/i386/kernel/reboot.c index 3514b4153f7f..8b5ff6e15412 100644 --- a/arch/i386/kernel/reboot.c +++ b/arch/i386/kernel/reboot.c | |||
@@ -17,7 +17,7 @@ | |||
17 | #include <asm/apic.h> | 17 | #include <asm/apic.h> |
18 | #include <asm/desc.h> | 18 | #include <asm/desc.h> |
19 | #include "mach_reboot.h" | 19 | #include "mach_reboot.h" |
20 | #include <linux/reboot_fixups.h> | 20 | #include <asm/reboot_fixups.h> |
21 | 21 | ||
22 | /* | 22 | /* |
23 | * Power off function, if any | 23 | * Power off function, if any |
@@ -316,6 +316,10 @@ void machine_shutdown(void) | |||
316 | #endif | 316 | #endif |
317 | } | 317 | } |
318 | 318 | ||
319 | void __attribute__((weak)) mach_reboot_fixups(void) | ||
320 | { | ||
321 | } | ||
322 | |||
319 | void machine_emergency_restart(void) | 323 | void machine_emergency_restart(void) |
320 | { | 324 | { |
321 | if (!reboot_thru_bios) { | 325 | if (!reboot_thru_bios) { |
diff --git a/arch/i386/kernel/reboot_fixups.c b/arch/i386/kernel/reboot_fixups.c index 99aab41a05b0..2d78d918340f 100644 --- a/arch/i386/kernel/reboot_fixups.c +++ b/arch/i386/kernel/reboot_fixups.c | |||
@@ -10,7 +10,7 @@ | |||
10 | 10 | ||
11 | #include <asm/delay.h> | 11 | #include <asm/delay.h> |
12 | #include <linux/pci.h> | 12 | #include <linux/pci.h> |
13 | #include <linux/reboot_fixups.h> | 13 | #include <asm/reboot_fixups.h> |
14 | 14 | ||
15 | static void cs5530a_warm_reset(struct pci_dev *dev) | 15 | static void cs5530a_warm_reset(struct pci_dev *dev) |
16 | { | 16 | { |