diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-11-15 04:51:40 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-11-15 04:51:40 -0500 |
| commit | f055408957750cf759162c364c2a4dfe19765844 (patch) | |
| tree | aecc0a13c582d310902e6fa95d8853c627828fcc /drivers/video/cg6.c | |
| parent | 83cbd33aae2c3cd14f80a8abf733033a57aa4923 (diff) | |
| parent | 4060994c3e337b40e0f6fa8ce2cc178e021baf3d (diff) | |
Merge branch 'master'
Diffstat (limited to 'drivers/video/cg6.c')
| -rw-r--r-- | drivers/video/cg6.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/video/cg6.c b/drivers/video/cg6.c index 414c4409e924..9debe642fd2f 100644 --- a/drivers/video/cg6.c +++ b/drivers/video/cg6.c | |||
| @@ -54,6 +54,9 @@ static struct fb_ops cg6_ops = { | |||
| 54 | .fb_sync = cg6_sync, | 54 | .fb_sync = cg6_sync, |
| 55 | .fb_mmap = cg6_mmap, | 55 | .fb_mmap = cg6_mmap, |
| 56 | .fb_ioctl = cg6_ioctl, | 56 | .fb_ioctl = cg6_ioctl, |
| 57 | #ifdef CONFIG_COMPAT | ||
| 58 | .fb_compat_ioctl = sbusfb_compat_ioctl, | ||
| 59 | #endif | ||
| 57 | }; | 60 | }; |
| 58 | 61 | ||
| 59 | /* Offset of interesting structures in the OBIO space */ | 62 | /* Offset of interesting structures in the OBIO space */ |