diff options
| author | Paul Mackerras <paulus@samba.org> | 2005-11-07 19:14:20 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2005-11-07 19:14:20 -0500 |
| commit | 24bfb00123e82a2e70bd115277d922438813515b (patch) | |
| tree | 27328b8a5718e16d64e2d101f4b7ddcad5930aed /drivers/video/s1d13xxxfb.c | |
| parent | c6135234550ed89a6fd0e8cb229633967e41d649 (diff) | |
| parent | 3f00d3e8fb963968a922d821a9a53b503b687e81 (diff) | |
Merge ../linux-2.6
Diffstat (limited to 'drivers/video/s1d13xxxfb.c')
| -rw-r--r-- | drivers/video/s1d13xxxfb.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/video/s1d13xxxfb.c b/drivers/video/s1d13xxxfb.c index f4437430dc5f..3edbd14c5c46 100644 --- a/drivers/video/s1d13xxxfb.c +++ b/drivers/video/s1d13xxxfb.c | |||
| @@ -388,7 +388,6 @@ static struct fb_ops s1d13xxxfb_fbops = { | |||
| 388 | .fb_fillrect = cfb_fillrect, | 388 | .fb_fillrect = cfb_fillrect, |
| 389 | .fb_copyarea = cfb_copyarea, | 389 | .fb_copyarea = cfb_copyarea, |
| 390 | .fb_imageblit = cfb_imageblit, | 390 | .fb_imageblit = cfb_imageblit, |
| 391 | .fb_cursor = soft_cursor | ||
| 392 | }; | 391 | }; |
| 393 | 392 | ||
| 394 | static int s1d13xxxfb_width_tab[2][4] __devinitdata = { | 393 | static int s1d13xxxfb_width_tab[2][4] __devinitdata = { |