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 git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into sh/for...
[sfrench/cifs-2.6.git]
/
arch
/
alpha
/
kernel
/
sys_alcor.c
diff --git
a/arch/alpha/kernel/sys_alcor.c
b/arch/alpha/kernel/sys_alcor.c
index 382035ef7394666e20f7a4b9c821f2f71051e800..20a30b8b96559e888223d16e60dec6bad9347297 100644
(file)
--- a/
arch/alpha/kernel/sys_alcor.c
+++ b/
arch/alpha/kernel/sys_alcor.c
@@
-90,7
+90,7
@@
alcor_end_irq(unsigned int irq)
}
static struct irq_chip alcor_irq_type = {
- .
typename
= "ALCOR",
+ .
name
= "ALCOR",
.startup = alcor_startup_irq,
.shutdown = alcor_disable_irq,
.enable = alcor_enable_irq,