Merge branch 'x86/doc' into x86/core

[mv-sheeva.git] / drivers / staging / meilhaus / me8200_do.c

diff --git a/drivers/staging/meilhaus/me8200_do.c b/drivers/staging/meilhaus/me8200_do.c
index 5f4ba5dfa860b82be3c94a833c8a163ca9d6456e..d2bebd16ff41bffff9b60c9ee6b6f632c72da036 100644 (file)
--- a/drivers/staging/meilhaus/me8200_do.c
+++ b/drivers/staging/meilhaus/me8200_do.c
@@ -475,7 +475,7 @@ static irqreturn_t me8200_do_isr(int irq, void *dev_id, struct pt_regs *regs)
             (ME8200_DO_IRQ_STATUS_BIT_ACTIVE << instance->do_idx))) {
                PINFO
                    ("%ld Shared interrupt. %s(): idx=%d irq_status_reg=0x%04X\n",
-                    jiffies, __FUNCTION__, instance->do_idx, irq_status);
+                    jiffies, __func__, instance->do_idx, irq_status);
                return IRQ_NONE;
        }