diff options
| author | David S. Miller <davem@davemloft.net> | 2009-12-01 18:46:35 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-12-01 18:46:35 -0500 |
| commit | 7e8f44f8d4fa9bb35e32c161fbcdbd6b9e6400e3 (patch) | |
| tree | cf6d526a070a06b365ab0ceb4e1c3ca9ad94666e /arch/alpha/kernel/sys_eb64p.c | |
| parent | 138f3c8518976953563a1316d7e0420c72d4ab96 (diff) | |
| parent | 2127816366e0ffbc1426fa69e7b9b2bebd2e2288 (diff) | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Diffstat (limited to 'arch/alpha/kernel/sys_eb64p.c')
| -rw-r--r-- | arch/alpha/kernel/sys_eb64p.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/alpha/kernel/sys_eb64p.c b/arch/alpha/kernel/sys_eb64p.c index 660c23ef661f..df2090ce5e7f 100644 --- a/arch/alpha/kernel/sys_eb64p.c +++ b/arch/alpha/kernel/sys_eb64p.c | |||
| @@ -70,7 +70,7 @@ eb64p_end_irq(unsigned int irq) | |||
| 70 | } | 70 | } |
| 71 | 71 | ||
| 72 | static struct irq_chip eb64p_irq_type = { | 72 | static struct irq_chip eb64p_irq_type = { |
| 73 | .typename = "EB64P", | 73 | .name = "EB64P", |
| 74 | .startup = eb64p_startup_irq, | 74 | .startup = eb64p_startup_irq, |
| 75 | .shutdown = eb64p_disable_irq, | 75 | .shutdown = eb64p_disable_irq, |
| 76 | .enable = eb64p_enable_irq, | 76 | .enable = eb64p_enable_irq, |