projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://oak/home/sfr/kernels/iseries/work
[powerpc.git]
/
arch
/
i386
/
kernel
/
reboot_fixups.c
diff --git
a/arch/i386/kernel/reboot_fixups.c
b/arch/i386/kernel/reboot_fixups.c
index
c9b8733
..
99aab41
100644
(file)
--- a/
arch/i386/kernel/reboot_fixups.c
+++ b/
arch/i386/kernel/reboot_fixups.c
@@
-10,6
+10,7
@@
#include <asm/delay.h>
#include <linux/pci.h>
#include <asm/delay.h>
#include <linux/pci.h>
+#include <linux/reboot_fixups.h>
static void cs5530a_warm_reset(struct pci_dev *dev)
{
static void cs5530a_warm_reset(struct pci_dev *dev)
{
@@
-42,7
+43,7
@@
void mach_reboot_fixups(void)
struct pci_dev *dev;
int i;
struct pci_dev *dev;
int i;
- for (i=0; i <
(sizeof(fixups_table)/sizeof(fixups_table[0])
); i++) {
+ for (i=0; i <
ARRAY_SIZE(fixups_table
); i++) {
cur = &(fixups_table[i]);
dev = pci_get_device(cur->vendor, cur->device, NULL);
if (!dev)
cur = &(fixups_table[i]);
dev = pci_get_device(cur->vendor, cur->device, NULL);
if (!dev)
@@
-50,7
+51,5
@@
void mach_reboot_fixups(void)
cur->reboot_fixup(dev);
}
cur->reboot_fixup(dev);
}
-
- printk(KERN_WARNING "No reboot fixup found for your hardware\n");
}
}