---

yaml --- r: 320728 b: refs/heads/master c: d554a3f h: refs/heads/master v: v3
git-mirror · Jul 19, 2012 · 0cf0f32 · 0cf0f32
1 parent fe2b11a
commit 0cf0f32
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git 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
@@ -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;