Commit bf50c903 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

drivers/power/pda_power.c

+1 −1
Original line number Diff line number Diff line
@@ -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;