diff options
| author | David S. Miller <davem@davemloft.net> | 2009-12-05 18:22:26 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-12-05 18:22:26 -0500 |
| commit | 28b4d5cc17c20786848cdc07b7ea237a309776bb (patch) | |
| tree | bae406a4b17229dcce7c11be5073f7a67665e477 /arch/x86/kernel/reboot.c | |
| parent | d29cecda036f251aee4947f47eea0fe9ed8cc931 (diff) | |
| parent | 96fa2b508d2d3fe040cf4ef2fffb955f0a537ea1 (diff) | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Conflicts:
drivers/net/pcmcia/fmvj18x_cs.c
drivers/net/pcmcia/nmclan_cs.c
drivers/net/pcmcia/xirc2ps_cs.c
drivers/net/wireless/ray_cs.c
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 | ||