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 c144bd575611f300249923264f065741957e9bb3..8473fe5ed7ffe79d190cffcc42b3b2b383e4cf58 100644 (file)
--- a/drivers/pnp/quirks.c
+++ b/drivers/pnp/quirks.c
@@ -337,9 +337,8 @@ void pnp_fixup_device(struct pnp_dev *dev)
        for (f = pnp_fixups; *f->id; f++) {
                if (!compare_pnp_id(dev->id, f->id))
                        continue;
-#ifdef DEBUG
-               dev_dbg(&dev->dev, "%s: calling %pF\n", f->id, f->quirk_function);
-#endif
+               pnp_dbg(&dev->dev, "%s: calling %pF\n", f->id,
+                       f->quirk_function);
                f->quirk_function(dev);
        }
 }