Merge branch 'v28-range-hrtimers-for-linus-v2' of git://git.kernel.org/pub/scm/linux...

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

diff --git a/drivers/pnp/quirks.c b/drivers/pnp/quirks.c
index 414bb09457299838ad5671d2162f97afa8522578..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);
@@ -337,7 +337,7 @@ void pnp_fixup_device(struct pnp_dev *dev)
        for (f = pnp_fixups; *f->id; f++) {
                if (!compare_pnp_id(dev->id, f->id))
                        continue;
-               dev_dbg(&dev->dev, "%s: calling %pF\n", f->id,
+               pnp_dbg(&dev->dev, "%s: calling %pF\n", f->id,
                        f->quirk_function);
                f->quirk_function(dev);
        }