Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...

[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 1b183b378c2c269ac06c05d2ba622fe0dad0884a..10e21a4773dd4e822a82d461c4d1ee17f3f7164d 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 <linux/reboot_fixups.h>
 
 static void cs5530a_warm_reset(struct pci_dev *dev)
 {
@@ -42,9 +43,9 @@ void mach_reboot_fixups(void)
        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, 0);
+               dev = pci_get_device(cur->vendor, cur->device, NULL);
                if (!dev)
                        continue;