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/atafb.c | |
| parent | 2f614fe04f4463ff22234133319067d7361f54e5 (diff) | |
| parent | 53a5fbdc2dff55161a206ed1a1385a8fa8055c34 (diff) | |
Merge branch 'master' into upstream-fixes
Diffstat (limited to 'drivers/video/atafb.c')
| -rw-r--r-- | drivers/video/atafb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/atafb.c b/drivers/video/atafb.c index 5831893bf7a0..02c41a626fa2 100644 --- a/drivers/video/atafb.c +++ b/drivers/video/atafb.c | |||
| @@ -1521,7 +1521,7 @@ static void falcon_set_par( struct atafb_par *par ) | |||
| 1521 | } | 1521 | } |
| 1522 | 1522 | ||
| 1523 | 1523 | ||
| 1524 | static irqreturn_t falcon_vbl_switcher( int irq, void *dummy, struct pt_regs *fp ) | 1524 | static irqreturn_t falcon_vbl_switcher( int irq, void *dummy ) |
| 1525 | { | 1525 | { |
| 1526 | struct falcon_hw *hw = &f_new_mode; | 1526 | struct falcon_hw *hw = &f_new_mode; |
| 1527 | 1527 | ||