projects
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
[linux-2.6]
/
arch
/
i386
/
kernel
/
reboot_fixups.c
diff --git
a/arch/i386/kernel/reboot_fixups.c
b/arch/i386/kernel/reboot_fixups.c
index
99aab41
..
2d78d91
100644
(file)
--- a/
arch/i386/kernel/reboot_fixups.c
+++ b/
arch/i386/kernel/reboot_fixups.c
@@
-10,7
+10,7
@@
#include <asm/delay.h>
#include <linux/pci.h>
-#include <
linux
/reboot_fixups.h>
+#include <
asm
/reboot_fixups.h>
static void cs5530a_warm_reset(struct pci_dev *dev)
{