diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-29 15:19:15 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-29 15:19:15 -0400 |
| commit | e9d52234e35b27ea4ea5f2ab64ca47b1a0c740ab (patch) | |
| tree | 318d37a7d55c79e6f7d86163fb28e0eccbb0fe83 /arch/mips/lasat/interrupt.c | |
| parent | 955c5038823748e529a49f0e33ab635d92843500 (diff) | |
| parent | 09af7b443c257460d45cb6c1896d29f173fef35b (diff) | |
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
Diffstat (limited to 'arch/mips/lasat/interrupt.c')
| -rw-r--r-- | arch/mips/lasat/interrupt.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/arch/mips/lasat/interrupt.c b/arch/mips/lasat/interrupt.c index c90da1639440..852a41901a5e 100644 --- a/arch/mips/lasat/interrupt.c +++ b/arch/mips/lasat/interrupt.c | |||
| @@ -71,14 +71,13 @@ static void end_lasat_irq(unsigned int irq) | |||
| 71 | } | 71 | } |
| 72 | 72 | ||
| 73 | static struct hw_interrupt_type lasat_irq_type = { | 73 | static struct hw_interrupt_type lasat_irq_type = { |
| 74 | "Lasat", | 74 | .typename = "Lasat", |
| 75 | startup_lasat_irq, | 75 | .startup = startup_lasat_irq, |
| 76 | shutdown_lasat_irq, | 76 | .shutdown = shutdown_lasat_irq, |
| 77 | enable_lasat_irq, | 77 | .enable = enable_lasat_irq, |
| 78 | disable_lasat_irq, | 78 | .disable = disable_lasat_irq, |
| 79 | mask_and_ack_lasat_irq, | 79 | .ack = mask_and_ack_lasat_irq, |
| 80 | end_lasat_irq, | 80 | .end = end_lasat_irq, |
| 81 | NULL | ||
| 82 | }; | 81 | }; |
| 83 | 82 | ||
| 84 | static inline int ls1bit32(unsigned int x) | 83 | static inline int ls1bit32(unsigned int x) |