diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-26 10:43:04 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-26 10:43:04 -0800 |
| commit | bf50c903faba4ec7686ee8a570ac384b0f20814d (patch) | |
| tree | 3d23ddec72419e33dbe1452b6a36b098ee2011cf /drivers | |
| parent | a90e8a75fbf9e7fe2d88da6a5cf38be07fd81c35 (diff) | |
| parent | 74194cc71074c8bc17690a5d826093fb6f6e9928 (diff) | |
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
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/power/pda_power.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/power/pda_power.c b/drivers/power/pda_power.c index d30bb766fce..b56a704409d 100644 --- 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; |