Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

[linux.git] / kernel / irq / spurious.c

diff --git a/kernel/irq/spurious.c b/kernel/irq/spurious.c
index 6d2fa6914b30bb1351c9a17c3ba82e552b96505c..2ed97a7c9b2a68f4e5013ccc4b10a4ec082adb5a 100644 (file)
--- a/kernel/irq/spurious.c
+++ b/kernel/irq/spurious.c
@@ -212,9 +212,9 @@ static void __report_bad_irq(struct irq_desc *desc, irqreturn_t action_ret)
         */
        raw_spin_lock_irqsave(&desc->lock, flags);
        for_each_action_of_desc(desc, action) {
-               printk(KERN_ERR "[<%p>] %pf", action->handler, action->handler);
+               printk(KERN_ERR "[<%p>] %ps", action->handler, action->handler);
                if (action->thread_fn)
-                       printk(KERN_CONT " threaded [<%p>] %pf",
+                       printk(KERN_CONT " threaded [<%p>] %ps",
                                        action->thread_fn, action->thread_fn);
                printk(KERN_CONT "\n");
        }