diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-26 13:43:04 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-26 13:43:04 -0500 |
| commit | bf50c903faba4ec7686ee8a570ac384b0f20814d (patch) | |
| tree | 3d23ddec72419e33dbe1452b6a36b098ee2011cf | |
| 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
| -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 d30bb766fcef..b56a704409d2 100644 --- a/drivers/power/pda_power.c +++ b/drivers/power/pda_power.c | |||
| @@ -20,7 +20,7 @@ | |||
| 20 | 20 | ||
| 21 | static inline unsigned int get_irq_flags(struct resource *res) | 21 | static inline unsigned int get_irq_flags(struct resource *res) |
| 22 | { | 22 | { |
| 23 | unsigned int flags = IRQF_DISABLED | IRQF_SHARED; | 23 | unsigned int flags = IRQF_SAMPLE_RANDOM | IRQF_SHARED; |
| 24 | 24 | ||
| 25 | flags |= res->flags & IRQF_TRIGGER_MASK; | 25 | flags |= res->flags & IRQF_TRIGGER_MASK; |
| 26 | 26 | ||