diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-08-11 02:59:21 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-08-11 02:59:21 -0400 |
| commit | cf206bffbb7542df54043fad9898113172af99d8 (patch) | |
| tree | c7e7ca9a93443b888f98a0c07e74751a1aa3c947 /kernel/irq/manage.c | |
| parent | c1955a3d4762e7a9bf84035eb3c4886a900f0d15 (diff) | |
| parent | 796aadeb1b2db9b5d463946766c5bbfd7717158c (diff) | |
Merge branch 'linus' into sched/clock
Diffstat (limited to 'kernel/irq/manage.c')
| -rw-r--r-- | kernel/irq/manage.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c index 152abfd3589f..0314074fa232 100644 --- a/kernel/irq/manage.c +++ b/kernel/irq/manage.c | |||
| @@ -323,7 +323,8 @@ static int __irq_set_trigger(struct irq_chip *chip, unsigned int irq, | |||
| 323 | ret = chip->set_type(irq, flags & IRQF_TRIGGER_MASK); | 323 | ret = chip->set_type(irq, flags & IRQF_TRIGGER_MASK); |
| 324 | 324 | ||
| 325 | if (ret) | 325 | if (ret) |
| 326 | pr_err("setting flow type for irq %u failed (%pF)\n", | 326 | pr_err("setting trigger mode %d for irq %u failed (%pF)\n", |
| 327 | (int)(flags & IRQF_TRIGGER_MASK), | ||
| 327 | irq, chip->set_type); | 328 | irq, chip->set_type); |
| 328 | 329 | ||
| 329 | return ret; | 330 | return ret; |