diff options
author | David Vrabel <david.vrabel@csr.com> | 2009-01-22 19:12:32 +0000 |
---|---|---|
committer | David Vrabel <david.vrabel@csr.com> | 2009-01-22 19:12:32 +0000 |
commit | dff243f7cb3a2ebbb09093066c1bc4a90ff5b3a4 (patch) | |
tree | 1c63e7c2f879cd322ca785671b74b4ff796dd24c /drivers/staging/meilhaus/me1400_ext_irq.c | |
parent | wusb: timeout when waiting for ASL/PZL updates in whci-hcd (diff) | |
parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband (diff) | |
download | linux-dev-dff243f7cb3a2ebbb09093066c1bc4a90ff5b3a4.tar.xz linux-dev-dff243f7cb3a2ebbb09093066c1bc4a90ff5b3a4.zip |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-upstream
Diffstat (limited to 'drivers/staging/meilhaus/me1400_ext_irq.c')
-rw-r--r-- | drivers/staging/meilhaus/me1400_ext_irq.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/meilhaus/me1400_ext_irq.c b/drivers/staging/meilhaus/me1400_ext_irq.c index b8c2696bc150..b4df7cc58ab7 100644 --- a/drivers/staging/meilhaus/me1400_ext_irq.c +++ b/drivers/staging/meilhaus/me1400_ext_irq.c @@ -349,7 +349,7 @@ static irqreturn_t me1400_ext_irq_isr(int irq, void *dev_id, (PLX_LOCAL_INT1_STATE | PLX_LOCAL_INT1_EN | PLX_PCI_INT_EN)) { spin_unlock(&instance->subdevice_lock); PINFO("%ld Shared interrupt. %s(): irq_status_reg=0x%04X\n", - jiffies, __FUNCTION__, status); + jiffies, __func__, status); return IRQ_NONE; } |