git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to kernel-2.6.20-1.2949.fc6.vs2.2.0.1
[linux-2.6.git]
/
arch
/
ppc
/
syslib
/
cpm2_pic.c
diff --git
a/arch/ppc/syslib/cpm2_pic.c
b/arch/ppc/syslib/cpm2_pic.c
index
29d95d4
..
fb2d584
100644
(file)
--- a/
arch/ppc/syslib/cpm2_pic.c
+++ b/
arch/ppc/syslib/cpm2_pic.c
@@
-123,7
+123,7
@@
static struct hw_interrupt_type cpm2_pic = {
.end = cpm2_end_irq,
};
.end = cpm2_end_irq,
};
-int cpm2_get_irq(
struct pt_regs *regs
)
+int cpm2_get_irq(
void
)
{
int irq;
unsigned long bits;
{
int irq;
unsigned long bits;
@@
-171,7
+171,7
@@
void cpm2_init_IRQ(void)
/* Enable chaining to OpenPIC, and make everything level
*/
for (i = 0; i < NR_CPM_INTS; i++) {
/* Enable chaining to OpenPIC, and make everything level
*/
for (i = 0; i < NR_CPM_INTS; i++) {
- irq_desc[i+CPM_IRQ_OFFSET].
handler
= &cpm2_pic;
+ irq_desc[i+CPM_IRQ_OFFSET].
chip
= &cpm2_pic;
irq_desc[i+CPM_IRQ_OFFSET].status |= IRQ_LEVEL;
}
}
irq_desc[i+CPM_IRQ_OFFSET].status |= IRQ_LEVEL;
}
}