diff options
author | Ingo Molnar <[email protected]> | 2008-08-14 10:55:26 +0200 |
---|---|---|
committer | Ingo Molnar <[email protected]> | 2008-08-14 10:55:26 +0200 |
commit | d4439087d316613548c70472291bf4ca646ce24b (patch) | |
tree | 4819f39cbbfcc2ed9c9f85c7a91cbf142f5b02d4 /kernel/irq/manage.c | |
parent | 26d809af6397ce5c37f5c44d89734d19cce1ad25 (diff) | |
parent | 30a2f3c60a84092c8084dfe788b710f8d0768cd4 (diff) |
Merge commit 'v2.6.27-rc3' into x86/xsave
Conflicts:
arch/x86/kernel/genapic_64.c
include/asm-x86/kvm_host.h
Signed-off-by: Ingo Molnar <[email protected]>
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 22d10d3189f8..60c49e324390 100644 --- a/kernel/irq/manage.c +++ b/kernel/irq/manage.c @@ -330,7 +330,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; |