summaryrefslogtreecommitdiffstats
path: root/arch/alpha/kernel/sys_cabriolet.c
diff options
context:
space:
mode:
authorRussell King2009-12-06 18:00:33 +0100
committerRussell King2009-12-06 18:00:33 +0100
commit3d14b5beba35250c548d3851a2b84fce742d8311 (patch)
tree065e3d93c3fcbc5ee4c44fa78662393cddbdf6de /arch/alpha/kernel/sys_cabriolet.c
parentMerge branch 'devel-stable' into devel (diff)
parentFix soc_common PCMCIA configuration (diff)
downloadkernel-qcow2-linux-3d14b5beba35250c548d3851a2b84fce742d8311.tar.gz
kernel-qcow2-linux-3d14b5beba35250c548d3851a2b84fce742d8311.tar.xz
kernel-qcow2-linux-3d14b5beba35250c548d3851a2b84fce742d8311.zip
Merge branch 'sa1100' into devel
Diffstat (limited to 'arch/alpha/kernel/sys_cabriolet.c')
-rw-r--r--arch/alpha/kernel/sys_cabriolet.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/alpha/kernel/sys_cabriolet.c b/arch/alpha/kernel/sys_cabriolet.c
index ed349436732b..affd0f3f25df 100644
--- a/arch/alpha/kernel/sys_cabriolet.c
+++ b/arch/alpha/kernel/sys_cabriolet.c
@@ -72,7 +72,7 @@ cabriolet_end_irq(unsigned int irq)
}
static struct irq_chip cabriolet_irq_type = {
- .typename = "CABRIOLET",
+ .name = "CABRIOLET",
.startup = cabriolet_startup_irq,
.shutdown = cabriolet_disable_irq,
.enable = cabriolet_enable_irq,