diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-08-15 16:16:15 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-08-15 16:16:15 +0200 |
| commit | 1a10390708d675ebf1a2f5e169a5165626afbd88 (patch) | |
| tree | d9ee7d10abd65e580fb74152a501089f51174225 /kernel/irq/manage.c | |
| parent | 239bd83104ec6bcba90221d8b0973d2565142ef8 (diff) | |
| parent | b635acec48bcaa9183fcbf4e3955616b0d4119b5 (diff) | |
| download | talos-op-linux-1a10390708d675ebf1a2f5e169a5165626afbd88.tar.gz talos-op-linux-1a10390708d675ebf1a2f5e169a5165626afbd88.zip | |
Merge branch 'linus' into x86/cpu
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, ret = chip->set_type(irq, flags & IRQF_TRIGGER_MASK); if (ret) - pr_err("setting flow type for irq %u failed (%pF)\n", + pr_err("setting trigger mode %d for irq %u failed (%pF)\n", + (int)(flags & IRQF_TRIGGER_MASK), irq, chip->set_type); return ret; |
