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 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc
[pandora-kernel.git]
/
arch
/
mips
/
kernel
/
i8259.c
diff --git
a/arch/mips/kernel/i8259.c
b/arch/mips/kernel/i8259.c
index
5c74eb7
..
32b397b
100644
(file)
--- a/
arch/mips/kernel/i8259.c
+++ b/
arch/mips/kernel/i8259.c
@@
-229,7
+229,7
@@
static void i8259A_shutdown(void)
*/
if (i8259A_auto_eoi >= 0) {
outb(0xff, PIC_MASTER_IMR); /* mask all of 8259A-1 */
*/
if (i8259A_auto_eoi >= 0) {
outb(0xff, PIC_MASTER_IMR); /* mask all of 8259A-1 */
- outb(0xff, PIC_SLAVE_IMR); /* mask all of 8259A-
1
*/
+ outb(0xff, PIC_SLAVE_IMR); /* mask all of 8259A-
2
*/
}
}
}
}
@@
-295,6
+295,7
@@
static void init_8259A(int auto_eoi)
static struct irqaction irq2 = {
.handler = no_action,
.name = "cascade",
static struct irqaction irq2 = {
.handler = no_action,
.name = "cascade",
+ .flags = IRQF_NO_THREAD,
};
static struct resource pic1_io_resource = {
};
static struct resource pic1_io_resource = {