diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-12-06 12:00:33 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-12-06 12:00:33 -0500 |
| commit | 3d14b5beba35250c548d3851a2b84fce742d8311 (patch) | |
| tree | 065e3d93c3fcbc5ee4c44fa78662393cddbdf6de /arch/x86/kernel/reboot.c | |
| parent | 0719dc341389882cc834ed18fc9b7fc6006b2b85 (diff) | |
| parent | 1bf8e6219552d5dd27012d567ec8c4bb9c2d86b4 (diff) | |
Merge branch 'sa1100' into devel
Diffstat (limited to 'arch/x86/kernel/reboot.c')
| -rw-r--r-- | arch/x86/kernel/reboot.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/kernel/reboot.c b/arch/x86/kernel/reboot.c index f93078746e00..2b97fc5b124e 100644 --- a/arch/x86/kernel/reboot.c +++ b/arch/x86/kernel/reboot.c | |||
| @@ -23,7 +23,7 @@ | |||
| 23 | # include <linux/ctype.h> | 23 | # include <linux/ctype.h> |
| 24 | # include <linux/mc146818rtc.h> | 24 | # include <linux/mc146818rtc.h> |
| 25 | #else | 25 | #else |
| 26 | # include <asm/iommu.h> | 26 | # include <asm/x86_init.h> |
| 27 | #endif | 27 | #endif |
| 28 | 28 | ||
| 29 | /* | 29 | /* |
| @@ -622,7 +622,7 @@ void native_machine_shutdown(void) | |||
| 622 | #endif | 622 | #endif |
| 623 | 623 | ||
| 624 | #ifdef CONFIG_X86_64 | 624 | #ifdef CONFIG_X86_64 |
| 625 | pci_iommu_shutdown(); | 625 | x86_platform.iommu_shutdown(); |
| 626 | #endif | 626 | #endif |
| 627 | } | 627 | } |
| 628 | 628 | ||