Commit bf50c903 authored by Linus Torvalds's avatar Linus Torvalds

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
parents a90e8a75 74194cc7
......@@ -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;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment