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 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee13...
[pandora-kernel.git]
/
arch
/
ppc
/
platforms
/
85xx
/
stx_gp3.c
diff --git
a/arch/ppc/platforms/85xx/stx_gp3.c
b/arch/ppc/platforms/85xx/stx_gp3.c
index
2246124
..
4bb18ab
100644
(file)
--- a/
arch/ppc/platforms/85xx/stx_gp3.c
+++ b/
arch/ppc/platforms/85xx/stx_gp3.c
@@
-156,17
+156,17
@@
gp3_setup_arch(void)
printk ("bi_immr_base = %8.8lx\n", binfo->bi_immr_base);
}
printk ("bi_immr_base = %8.8lx\n", binfo->bi_immr_base);
}
-static irqreturn_t cpm2_cascade(int irq, void *dev_id
, struct pt_regs *regs
)
+static irqreturn_t cpm2_cascade(int irq, void *dev_id)
{
{
- while ((irq = cpm2_get_irq(
regs
)) >= 0)
- __do_IRQ(irq
, regs
);
+ while ((irq = cpm2_get_irq()) >= 0)
+ __do_IRQ(irq);
return IRQ_HANDLED;
}
static struct irqaction cpm2_irqaction = {
.handler = cpm2_cascade,
return IRQ_HANDLED;
}
static struct irqaction cpm2_irqaction = {
.handler = cpm2_cascade,
- .flags =
SA_INTERRUPT
,
+ .flags =
IRQF_DISABLED
,
.mask = CPU_MASK_NONE,
.name = "cpm2_cascade",
};
.mask = CPU_MASK_NONE,
.name = "cpm2_cascade",
};