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_rx164.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_rx164.c')
| -rw-r--r-- | arch/alpha/kernel/sys_rx164.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/alpha/kernel/sys_rx164.c b/arch/alpha/kernel/sys_rx164.c index fc9246373452..be161129eab9 100644 --- a/arch/alpha/kernel/sys_rx164.c +++ b/arch/alpha/kernel/sys_rx164.c | |||
| @@ -73,7 +73,7 @@ rx164_end_irq(unsigned int irq) | |||
| 73 | } | 73 | } |
| 74 | 74 | ||
| 75 | static struct irq_chip rx164_irq_type = { | 75 | static struct irq_chip rx164_irq_type = { |
| 76 | .typename = "RX164", | 76 | .name = "RX164", |
| 77 | .startup = rx164_startup_irq, | 77 | .startup = rx164_startup_irq, |
| 78 | .shutdown = rx164_disable_irq, | 78 | .shutdown = rx164_disable_irq, |
| 79 | .enable = rx164_enable_irq, | 79 | .enable = rx164_enable_irq, |