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 'hwmon-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6
[pandora-kernel.git]
/
arch
/
x86_64
/
kernel
/
i8259.c
diff --git
a/arch/x86_64/kernel/i8259.c
b/arch/x86_64/kernel/i8259.c
index
d73c79e
..
01e2cf0
100644
(file)
--- a/
arch/x86_64/kernel/i8259.c
+++ b/
arch/x86_64/kernel/i8259.c
@@
-103,6
+103,7
@@
static void mask_and_ack_8259A(unsigned int);
static struct irq_chip i8259A_chip = {
.name = "XT-PIC",
.mask = disable_8259A_irq,
+ .disable = disable_8259A_irq,
.unmask = enable_8259A_irq,
.mask_ack = mask_and_ack_8259A,
};