From c153cf84397b2d8e0ecde34280aa5e88156b9252 Mon Sep 17 00:00:00 2001
From: David Brownell <dbrownell@users.sourceforge.net>
Date: Tue, 5 Aug 2008 13:01:14 -0700
Subject: [PATCH] --- yaml --- r: 107663 b: refs/heads/master c:
 c69ad71bcdecbaab82cfacb1dc967bd7fd967a3b h: refs/heads/master i:   107661:
 abe8d5e6863b5e06d8af3ada29bf498a87a43d63   107659:
 d06a412344702c122a134e0f6059d97ddd7c4856   107655:
 715fff76a518c537cfc134b361a653beaa3a08ef   107647:
 f317d16e1bfa3a2087c3650eb0c06c993e3ddff9 v: v3

---
 [refs]                    | 2 +-
 trunk/kernel/irq/manage.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index d955e4b4e178..c8e7f10b58a0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5b2becc8cffdccdd60c63099f592ddd35aa6c34f
+refs/heads/master: c69ad71bcdecbaab82cfacb1dc967bd7fd967a3b
diff --git a/trunk/kernel/irq/manage.c b/trunk/kernel/irq/manage.c
index 152abfd3589f..0314074fa232 100644
--- a/trunk/kernel/irq/manage.c
+++ b/trunk/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;