diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-05 19:32:01 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-05 19:32:01 -0400 |
| commit | 44aefd2706bb6f5b65ba2c38cd89e7609e2b43d3 (patch) | |
| tree | 93824f573767da634fbc82c388b6d33cc454212b /drivers/video/arcfb.c | |
| parent | c1a26e7d40fb814716950122353a1a556844286b (diff) | |
| parent | 7d12e780e003f93433d49ce78cfedf4b4c52adc5 (diff) | |
Merge git://git.infradead.org/~dhowells/irq-2.6
* git://git.infradead.org/~dhowells/irq-2.6:
IRQ: Maintain regs pointer globally rather than passing to IRQ handlers
IRQ: Typedef the IRQ handler function type
IRQ: Typedef the IRQ flow handler function type
Diffstat (limited to 'drivers/video/arcfb.c')
| -rw-r--r-- | drivers/video/arcfb.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/video/arcfb.c b/drivers/video/arcfb.c index 70dd8115a4d8..ab34b96acc31 100644 --- a/drivers/video/arcfb.c +++ b/drivers/video/arcfb.c | |||
| @@ -218,8 +218,7 @@ static int arcfb_pan_display(struct fb_var_screeninfo *var, | |||
| 218 | return -EINVAL; | 218 | return -EINVAL; |
| 219 | } | 219 | } |
| 220 | 220 | ||
| 221 | static irqreturn_t arcfb_interrupt(int vec, void *dev_instance, | 221 | static irqreturn_t arcfb_interrupt(int vec, void *dev_instance) |
| 222 | struct pt_regs *regs) | ||
| 223 | { | 222 | { |
| 224 | struct fb_info *info = dev_instance; | 223 | struct fb_info *info = dev_instance; |
| 225 | unsigned char ctl2status; | 224 | unsigned char ctl2status; |