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 'linus' into release
[pandora-kernel.git]
/
arch
/
powerpc
/
platforms
/
chrp
/
setup.c
diff --git
a/arch/powerpc/platforms/chrp/setup.c
b/arch/powerpc/platforms/chrp/setup.c
index
272d79a
..
cd4ad9a
100644
(file)
--- a/
arch/powerpc/platforms/chrp/setup.c
+++ b/
arch/powerpc/platforms/chrp/setup.c
@@
-472,7
+472,6
@@
static void __init chrp_find_openpic(void)
#if defined(CONFIG_VT) && defined(CONFIG_INPUT_ADBHID) && defined(CONFIG_XMON)
static struct irqaction xmon_irqaction = {
.handler = xmon_irq,
- .mask = CPU_MASK_NONE,
.name = "XMON break",
};
#endif