Merge git://git.infradead.org/battery-2.6

* git://git.infradead.org/battery-2.6: power_supply: pda_power: Don't request shared IRQs w/ IRQF_DISABLED
beagleboard · Jan 26, 2009 · bf50c90 · bf50c90
2 parents a90e8a7 + 74194cc
commit bf50c90
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/drivers/power/pda_power.c b/drivers/power/pda_power.c
@@ -20,7 +20,7 @@
 
 static inline unsigned int get_irq_flags(struct resource *res)
 {
-	unsigned int flags = IRQF_DISABLED | IRQF_SHARED;
+	unsigned int flags = IRQF_SAMPLE_RANDOM | IRQF_SHARED;
 
 	flags |= res->flags & IRQF_TRIGGER_MASK;