diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-10-11 03:56:12 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-10-11 03:56:12 -0400 |
| commit | 24fcbacedb0d83cabc6761acbecfbf751265ce52 (patch) | |
| tree | 7147b206304b028c3cfd5de6317e5c8510098ca9 /drivers/video/amifb.c | |
| parent | 2f614fe04f4463ff22234133319067d7361f54e5 (diff) | |
| parent | 53a5fbdc2dff55161a206ed1a1385a8fa8055c34 (diff) | |
Merge branch 'master' into upstream-fixes
Diffstat (limited to 'drivers/video/amifb.c')
| -rw-r--r-- | drivers/video/amifb.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/video/amifb.c b/drivers/video/amifb.c index f1ba54f4fc39..a4e3fca05891 100644 --- a/drivers/video/amifb.c +++ b/drivers/video/amifb.c | |||
| @@ -1144,7 +1144,7 @@ static void amifb_deinit(void); | |||
| 1144 | */ | 1144 | */ |
| 1145 | 1145 | ||
| 1146 | static int flash_cursor(void); | 1146 | static int flash_cursor(void); |
| 1147 | static irqreturn_t amifb_interrupt(int irq, void *dev_id, struct pt_regs *fp); | 1147 | static irqreturn_t amifb_interrupt(int irq, void *dev_id); |
| 1148 | static u_long chipalloc(u_long size); | 1148 | static u_long chipalloc(u_long size); |
| 1149 | static void chipfree(void); | 1149 | static void chipfree(void); |
| 1150 | 1150 | ||
| @@ -2492,7 +2492,7 @@ static int flash_cursor(void) | |||
| 2492 | * VBlank Display Interrupt | 2492 | * VBlank Display Interrupt |
| 2493 | */ | 2493 | */ |
| 2494 | 2494 | ||
| 2495 | static irqreturn_t amifb_interrupt(int irq, void *dev_id, struct pt_regs *fp) | 2495 | static irqreturn_t amifb_interrupt(int irq, void *dev_id) |
| 2496 | { | 2496 | { |
| 2497 | if (do_vmode_pan || do_vmode_full) | 2497 | if (do_vmode_pan || do_vmode_full) |
| 2498 | ami_update_display(); | 2498 | ami_update_display(); |