git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branches 'topic/fix/misc' and 'topic/fix/hda' into for-linus
[pandora-kernel.git]
/
arch
/
arm
/
mach-h720x
/
cpu-h7202.c
diff --git
a/arch/arm/mach-h720x/cpu-h7202.c
b/arch/arm/mach-h720x/cpu-h7202.c
index
53e1f62
..
fd33a19
100644
(file)
--- a/
arch/arm/mach-h720x/cpu-h7202.c
+++ b/
arch/arm/mach-h720x/cpu-h7202.c
@@
-120,12
+120,10
@@
h7202_timerx_demux_handler(unsigned int irq_unused, struct irq_desc *desc)
mask >>= 1;
irq = IRQ_TIMER1;
mask >>= 1;
irq = IRQ_TIMER1;
- desc = irq_desc + irq;
while (mask) {
if (mask & 1)
while (mask) {
if (mask & 1)
-
desc_handle_irq(irq, desc
);
+
generic_handle_irq(irq
);
irq++;
irq++;
- desc++;
mask >>= 1;
}
}
mask >>= 1;
}
}