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
linux 2.6.16.38 w/ vs2.0.3-rc1
[linux-2.6.git]
/
arch
/
mips
/
sgi-ip22
/
ip22-int.c
diff --git
a/arch/mips/sgi-ip22/ip22-int.c
b/arch/mips/sgi-ip22/ip22-int.c
index
acb44a1
..
d16fb43
100644
(file)
--- a/
arch/mips/sgi-ip22/ip22-int.c
+++ b/
arch/mips/sgi-ip22/ip22-int.c
@@
-28,7
+28,7
@@
/* #define DEBUG_SGINT */
/* So far nothing hangs here */
/* #define DEBUG_SGINT */
/* So far nothing hangs here */
-#undef USE_LIO3_IRQ
+#undef USE_LIO3_IRQ
struct sgint_regs *sgint;
struct sgint_regs *sgint;
@@
-272,32
+272,32
@@
void indy_buserror_irq(struct pt_regs *regs)
irq_exit();
}
irq_exit();
}
-static struct irqaction local0_cascade = {
+static struct irqaction local0_cascade = {
.handler = no_action,
.flags = SA_INTERRUPT,
.name = "local0 cascade",
};
.handler = no_action,
.flags = SA_INTERRUPT,
.name = "local0 cascade",
};
-static struct irqaction local1_cascade = {
+static struct irqaction local1_cascade = {
.handler = no_action,
.flags = SA_INTERRUPT,
.name = "local1 cascade",
};
.handler = no_action,
.flags = SA_INTERRUPT,
.name = "local1 cascade",
};
-static struct irqaction buserr = {
+static struct irqaction buserr = {
.handler = no_action,
.flags = SA_INTERRUPT,
.name = "Bus Error",
};
.handler = no_action,
.flags = SA_INTERRUPT,
.name = "Bus Error",
};
-static struct irqaction map0_cascade = {
+static struct irqaction map0_cascade = {
.handler = no_action,
.flags = SA_INTERRUPT,
.name = "mapable0 cascade",
};
#ifdef USE_LIO3_IRQ
.handler = no_action,
.flags = SA_INTERRUPT,
.name = "mapable0 cascade",
};
#ifdef USE_LIO3_IRQ
-static struct irqaction map1_cascade = {
+static struct irqaction map1_cascade = {
.handler = no_action,
.flags = SA_INTERRUPT,
.name = "mapable1 cascade",
.handler = no_action,
.flags = SA_INTERRUPT,
.name = "mapable1 cascade",
@@
-309,7
+309,7
@@
static struct irqaction map1_cascade = {
extern void mips_cpu_irq_init(unsigned int irq_base);
extern void mips_cpu_irq_init(unsigned int irq_base);
-void __init
init_IRQ
(void)
+void __init
arch_init_irq
(void)
{
int i;
{
int i;
@@
-371,7
+371,6
@@
void __init init_IRQ(void)
set_except_vector(0, indyIRQ);
set_except_vector(0, indyIRQ);
- init_generic_irq();
/* init CPU irqs */
mips_cpu_irq_init(SGINT_CPU);
/* init CPU irqs */
mips_cpu_irq_init(SGINT_CPU);