From 0cf0f324bcad6c81fd1837b055eb6b92c9ad8493 Mon Sep 17 00:00:00 2001
From: Theodore Ts'o <tytso@mit.edu>
Date: Tue, 17 Jul 2012 13:40:18 -0400
Subject: [PATCH] --- yaml --- r: 320728 b: refs/heads/master c:
 d554a3f9d3f3b0bb2faefad712e6d0dbd7c82ba6 h: refs/heads/master v: v3

---
 [refs]                          | 2 +-
 trunk/drivers/power/pda_power.c | 6 +-----
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index a3f2f49df011..9632b879e2e0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d38a0149e8a11ca333c1a6c489a2ccac2b73f2cb
+refs/heads/master: d554a3f9d3f3b0bb2faefad712e6d0dbd7c82ba6
diff --git a/trunk/drivers/power/pda_power.c b/trunk/drivers/power/pda_power.c
index 214468f4444a..db5c526154d0 100644
--- a/trunk/drivers/power/pda_power.c
+++ b/trunk/drivers/power/pda_power.c
@@ -24,11 +24,7 @@
 
 static inline unsigned int get_irq_flags(struct resource *res)
 {
-	unsigned int flags = IRQF_SAMPLE_RANDOM | IRQF_SHARED;
-
-	flags |= res->flags & IRQF_TRIGGER_MASK;
-
-	return flags;
+	return IRQF_SHARED | (res->flags & IRQF_TRIGGER_MASK);
 }
 
 static struct device *dev;