Merge branch 'linus' into test

[linux-2.6-omap-h63xx.git] / drivers / pnp / quirks.c

diff --git a/drivers/pnp/quirks.c b/drivers/pnp/quirks.c
index 3d2e56094783813a1fea5a2e76bc72f4d85d270a..8473fe5ed7ffe79d190cffcc42b3b2b383e4cf58 100644 (file)
--- a/drivers/pnp/quirks.c
+++ b/drivers/pnp/quirks.c
@@ -245,7 +245,7 @@ static void quirk_system_pci_resources(struct pnp_dev *dev)
         */
        for_each_pci_dev(pdev) {
                for (i = 0; i < DEVICE_COUNT_RESOURCE; i++) {
-                       unsigned int type;
+                       unsigned long type;
 
                        type = pci_resource_flags(pdev, i) &
                                        (IORESOURCE_IO | IORESOURCE_MEM);