diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-22 02:56:19 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-22 02:56:19 +0400 |
| commit | 98a1e95f9b5919b55c71a01546415074282d30d5 (patch) | |
| tree | 7e539231ae9cf64614b6b9b358804ff8fdf056be /drivers/char/stallion.c | |
| parent | abe834c8a5d7e55ee12c0c8c7a5308b2c5cba95d (diff) | |
| parent | 896c6fa1e59dd17e1ac2877c25cab19bbb24e666 (diff) | |
| download | linux-98a1e95f9b5919b55c71a01546415074282d30d5.tar.xz | |
Merge branch 'irq-cleanups-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/misc-2.6
* 'irq-cleanups-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/misc-2.6:
[ISDN] minor irq handler cleanups
drivers/char: minor irq handler cleanups
[PPC] minor irq handler cleanups
[BLACKFIN] minor irq handler cleanups
[SPARC] minor irq handler cleanups
ARM minor irq handler cleanup: avoid passing unused info to irq
Diffstat (limited to 'drivers/char/stallion.c')
| -rw-r--r-- | drivers/char/stallion.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/stallion.c b/drivers/char/stallion.c index feac54e32a12..874aaa08e956 100644 --- a/drivers/char/stallion.c +++ b/drivers/char/stallion.c @@ -1645,7 +1645,7 @@ static irqreturn_t stl_intr(int irq, void *dev_id) { struct stlbrd *brdp = dev_id; - pr_debug("stl_intr(brdp=%p,irq=%d)\n", brdp, irq); + pr_debug("stl_intr(brdp=%p,irq=%d)\n", brdp, brdp->irq); return IRQ_RETVAL((* brdp->isr)(brdp)); } |