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-eisa.c
diff --git
a/arch/mips/sgi-ip22/ip22-eisa.c
b/arch/mips/sgi-ip22/ip22-eisa.c
index
ee0514a
..
b198201
100644
(file)
--- a/
arch/mips/sgi-ip22/ip22-eisa.c
+++ b/
arch/mips/sgi-ip22/ip22-eisa.c
@@
-19,6
+19,7
@@
* - Fix more bugs.
*/
* - Fix more bugs.
*/
+#include <linux/config.h>
#include <linux/eisa.h>
#include <linux/types.h>
#include <linux/init.h>
#include <linux/eisa.h>
#include <linux/types.h>
#include <linux/init.h>
@@
-144,7
+145,7
@@
static void end_eisa1_irq(unsigned int irq)
enable_eisa1_irq(irq);
}
enable_eisa1_irq(irq);
}
-static struct
irq_chip
ip22_eisa1_irq_type = {
+static struct
hw_interrupt_type
ip22_eisa1_irq_type = {
.typename = "IP22 EISA",
.startup = startup_eisa1_irq,
.shutdown = shutdown_eisa1_irq,
.typename = "IP22 EISA",
.startup = startup_eisa1_irq,
.shutdown = shutdown_eisa1_irq,
@@
-206,7
+207,7
@@
static void end_eisa2_irq(unsigned int irq)
enable_eisa2_irq(irq);
}
enable_eisa2_irq(irq);
}
-static struct
irq_chip
ip22_eisa2_irq_type = {
+static struct
hw_interrupt_type
ip22_eisa2_irq_type = {
.typename = "IP22 EISA",
.startup = startup_eisa2_irq,
.shutdown = shutdown_eisa2_irq,
.typename = "IP22 EISA",
.startup = startup_eisa2_irq,
.shutdown = shutdown_eisa2_irq,
@@
-278,9
+279,9
@@
int __init ip22_eisa_init(void)
irq_desc[i].action = 0;
irq_desc[i].depth = 1;
if (i < (SGINT_EISA + 8))
irq_desc[i].action = 0;
irq_desc[i].depth = 1;
if (i < (SGINT_EISA + 8))
- irq_desc[i].
chip
= &ip22_eisa1_irq_type;
+ irq_desc[i].
handler
= &ip22_eisa1_irq_type;
else
else
- irq_desc[i].
chip
= &ip22_eisa2_irq_type;
+ irq_desc[i].
handler
= &ip22_eisa2_irq_type;
}
/* Cannot use request_irq because of kmalloc not being ready at such
}
/* Cannot use request_irq because of kmalloc not being ready at such