patch-2.3.30 linux/drivers/pci/setup.c

• Lines: 28
• Date: Mon Dec 6 17:15:53 1999
• Orig file: v2.3.29/linux/drivers/pci/setup.c
• Orig date: Tue Nov 23 22:42:21 1999

diff -u --recursive --new-file v2.3.29/linux/drivers/pci/setup.c linux/drivers/pci/setup.c
@@ -16,8 +16,7 @@
 #include <linux/pci.h>
 #include <linux/errno.h>
 #include <linux/ioport.h>
-
-#include <asm/cache.h>
+#include <linux/cache.h>
 
 
 #define DEBUG_CONFIG 0
@@ -84,7 +83,7 @@
 		DBGC(("  for root[%lx:%lx] min[%lx] size[%lx]\n",
 		      root->start, root->end, min, size));
 
-		if (allocate_resource(root, res, size, min, -1, size, dev) < 0) {
+		if (allocate_resource(root, res, size, min, -1, size, pcibios_align_resource, dev) < 0) {
 			printk(KERN_ERR
 			       "PCI: Failed to allocate resource %d for %s\n",
 			       i, dev->name);
@@ -271,7 +270,7 @@
 		pbus_set_ranges(bus, NULL);
 }
 
-static void
+static void __init
 pdev_fixup_irq(struct pci_dev *dev,
 	       u8 (*swizzle)(struct pci_dev *, u8 *),
 	       int (*map_irq)(struct pci_dev *, u8, u8))