diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-11-09 01:07:12 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-11-09 01:07:12 -0500 |
| commit | a892acacd3a8546ac161526522f13b5174f2c471 (patch) | |
| tree | ee6d36f27f1388989ebfcabf90253fb7194112ac /drivers/video/macfb.c | |
| parent | 193515d51ccb363165d6b09e9ba5c21089e34bad (diff) | |
| parent | 330d57fb98a916fa8e1363846540dd420e99499a (diff) | |
Merge branch 'master'
Diffstat (limited to 'drivers/video/macfb.c')
| -rw-r--r-- | drivers/video/macfb.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/video/macfb.c b/drivers/video/macfb.c index 4945a4c02209..cfc748e94272 100644 --- a/drivers/video/macfb.c +++ b/drivers/video/macfb.c | |||
| @@ -589,7 +589,6 @@ static struct fb_ops macfb_ops = { | |||
| 589 | .fb_fillrect = cfb_fillrect, | 589 | .fb_fillrect = cfb_fillrect, |
| 590 | .fb_copyarea = cfb_copyarea, | 590 | .fb_copyarea = cfb_copyarea, |
| 591 | .fb_imageblit = cfb_imageblit, | 591 | .fb_imageblit = cfb_imageblit, |
| 592 | .fb_cursor = soft_cursor, | ||
| 593 | }; | 592 | }; |
| 594 | 593 | ||
| 595 | void __init macfb_setup(char *options) | 594 | void __init macfb_setup(char *options) |