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
/
sh
/
cchips
/
hd6446x
/
hd64461
/
setup.c
diff --git
a/arch/sh/cchips/hd6446x/hd64461/setup.c
b/arch/sh/cchips/hd6446x/hd64461/setup.c
index
ad12601
..
f014b9b
100644
(file)
--- a/
arch/sh/cchips/hd6446x/hd64461/setup.c
+++ b/
arch/sh/cchips/hd6446x/hd64461/setup.c
@@
-4,6
+4,7
@@
* Hitachi HD64461 companion chip support
*/
* Hitachi HD64461 companion chip support
*/
+#include <linux/config.h>
#include <linux/sched.h>
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/sched.h>
#include <linux/module.h>
#include <linux/kernel.h>
@@
-133,7
+134,7
@@
int hd64461_irq_demux(int irq)
return __irq_demux(irq);
}
return __irq_demux(irq);
}
-static struct irqaction irq0 = { hd64461_interrupt,
IRQF_DISABLED
, CPU_MASK_NONE, "HD64461", NULL, NULL };
+static struct irqaction irq0 = { hd64461_interrupt,
SA_INTERRUPT
, CPU_MASK_NONE, "HD64461", NULL, NULL };
int __init setup_hd64461(void)
{
int __init setup_hd64461(void)
{
@@
-153,7
+154,7
@@
int __init setup_hd64461(void)
outw(0xffff, HD64461_NIMR);
for (i = HD64461_IRQBASE; i < HD64461_IRQBASE + 16; i++) {
outw(0xffff, HD64461_NIMR);
for (i = HD64461_IRQBASE; i < HD64461_IRQBASE + 16; i++) {
- irq_desc[i].
chip
= &hd64461_irq_type;
+ irq_desc[i].
handler
= &hd64461_irq_type;
}
setup_irq(CONFIG_HD64461_IRQ, &irq0);
}
setup_irq(CONFIG_HD64461_IRQ, &irq0);