git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 's3c24xx-updates' of git://git.fluff.org/bjdooks/linux
[sfrench/cifs-2.6.git]
/
arch
/
alpha
/
kernel
/
irq_i8259.c
diff --git
a/arch/alpha/kernel/irq_i8259.c
b/arch/alpha/kernel/irq_i8259.c
index 50bfec9b588ffbc8ba4d08a47c532bf5f0de7299..83a9ac2808908cf49e2014bf1960e4cdb95afc95 100644
(file)
--- a/
arch/alpha/kernel/irq_i8259.c
+++ b/
arch/alpha/kernel/irq_i8259.c
@@
-84,7
+84,7
@@
i8259a_end_irq(unsigned int irq)
}
struct irq_chip i8259a_irq_type = {
- .
typename
= "XT-PIC",
+ .
name
= "XT-PIC",
.startup = i8259a_startup_irq,
.shutdown = i8259a_disable_irq,
.enable = i8259a_enable_irq,