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
This commit was manufactured by cvs2svn to create tag
[linux-2.6.git]
/
arch
/
ppc
/
platforms
/
chrp_setup.c
diff --git
a/arch/ppc/platforms/chrp_setup.c
b/arch/ppc/platforms/chrp_setup.c
index
03b3b3b
..
3514bb9
100644
(file)
--- a/
arch/ppc/platforms/chrp_setup.c
+++ b/
arch/ppc/platforms/chrp_setup.c
@@
-371,14
+371,6
@@
static void __init chrp_find_openpic(void)
}
}
}
}
-#if defined(CONFIG_VT) && defined(CONFIG_INPUT_ADBHID) && defined(XMON)
-static struct irqaction xmon_irqaction = {
- .handler = xmon_irq,
- .mask = CPU_MASK_NONE,
- .name = "XMON break",
-};
-#endif
-
void __init chrp_init_IRQ(void)
{
struct device_node *np;
void __init chrp_init_IRQ(void)
{
struct device_node *np;
@@
-424,7
+416,7
@@
void __init chrp_init_IRQ(void)
&& strcmp(kbd->parent->type, "adb") == 0)
break;
if (kbd)
&& strcmp(kbd->parent->type, "adb") == 0)
break;
if (kbd)
-
setup_irq(HYDRA_INT_ADB_NMI, &xmon_irqaction
);
+
request_irq(HYDRA_INT_ADB_NMI, xmon_irq, 0, "XMON break", 0
);
#endif
}
#endif
}