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
This commit is contained in:
Linus Torvalds 2009-01-26 10:43:04 -08:00
commit bf50c903fa
1 changed files with 1 additions and 1 deletions

View File

@ -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;