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 branch 'devel-stable' of master.kernel.org:/home/rmk/linux-2.6-arm
[pandora-kernel.git]
/
arch
/
arm
/
mach-sa1100
/
neponset.c
diff --git
a/arch/arm/mach-sa1100/neponset.c
b/arch/arm/mach-sa1100/neponset.c
index
c601a75
..
4aad01f
100644
(file)
--- a/
arch/arm/mach-sa1100/neponset.c
+++ b/
arch/arm/mach-sa1100/neponset.c
@@
-35,7
+35,7
@@
neponset_irq_handler(unsigned int irq, struct irq_desc *desc)
/*
* Acknowledge the parent IRQ.
*/
/*
* Acknowledge the parent IRQ.
*/
- desc->
chip->ack(irq
);
+ desc->
irq_data.chip->irq_ack(&desc->irq_data
);
/*
* Read the interrupt reason register. Let's have all
/*
* Read the interrupt reason register. Let's have all
@@
-53,7
+53,7
@@
neponset_irq_handler(unsigned int irq, struct irq_desc *desc)
* recheck the register for any pending IRQs.
*/
if (irr & (IRR_ETHERNET | IRR_USAR)) {
* recheck the register for any pending IRQs.
*/
if (irr & (IRR_ETHERNET | IRR_USAR)) {
- desc->
chip->mask(irq
);
+ desc->
irq_data.chip->irq_mask(&desc->irq_data
);
/*
* Ack the interrupt now to prevent re-entering
/*
* Ack the interrupt now to prevent re-entering
@@
-61,7
+61,7
@@
neponset_irq_handler(unsigned int irq, struct irq_desc *desc)
* since we'll check the IRR register prior to
* leaving.
*/
* since we'll check the IRR register prior to
* leaving.
*/
- desc->
chip->ack(irq
);
+ desc->
irq_data.chip->irq_ack(&desc->irq_data
);
if (irr & IRR_ETHERNET) {
generic_handle_irq(IRQ_NEPONSET_SMC9196);
if (irr & IRR_ETHERNET) {
generic_handle_irq(IRQ_NEPONSET_SMC9196);
@@
-71,7
+71,7
@@
neponset_irq_handler(unsigned int irq, struct irq_desc *desc)
generic_handle_irq(IRQ_NEPONSET_USAR);
}
generic_handle_irq(IRQ_NEPONSET_USAR);
}
- desc->
chip->unmask(irq
);
+ desc->
irq_data.chip->irq_unmask(&desc->irq_data
);
}
if (irr & IRR_SA1111) {
}
if (irr & IRR_SA1111) {