Add changes from the Linux-2.6 tree.

[linux-2.6.git] / arch / sh / boards / mpc1211 / pci.c

diff --git a/arch/sh/boards/mpc1211/pci.c b/arch/sh/boards/mpc1211/pci.c
index c9bbd72..4ed1a95 100644 (file)
--- a/arch/sh/boards/mpc1211/pci.c
+++ b/arch/sh/boards/mpc1211/pci.c
@@ -11,7 +11,6 @@
  *  License.  See linux/COPYING for more information.
  *
  */
-#include <linux/config.h>
 #include <linux/types.h>
 #include <linux/kernel.h>
 #include <linux/init.h>
@@ -176,14 +175,7 @@ static void __devinit quirk_ali_ide_ports(struct pci_dev *dev)
        dev->resource[4].end   = 0xf00f;
        dev->resource[4].flags = IORESOURCE_IO;
 }
-
-
-/* Add future fixups here... */
-struct pci_fixup pcibios_fixups[] = {
-       { PCI_FIXUP_HEADER, PCI_VENDOR_ID_AL,
-         PCI_DEVICE_ID_AL_M5229, quirk_ali_ide_ports },
-       { 0 }
-};
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_AL, PCI_DEVICE_ID_AL_M5229, quirk_ali_ide_ports);
 
 char * __devinit pcibios_setup(char *str)
 {
@@ -280,9 +272,9 @@ void __init pcibios_fixup_irqs(void)
 }
 
 void pcibios_align_resource(void *data, struct resource *res,
-                           unsigned long size, unsigned long align)
+                           resource_size_t size, resource_size_t align)
 {
-       unsigned long start = res->start;
+       resource_size_t start = res->start;
 
        if (res->flags & IORESOURCE_IO) {
                if (start >= 0x10000UL) {