diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-12 15:23:25 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-12 15:23:25 -0500 |
| commit | 9e6c67fd2716720d9029d38ea25884efcfdedeb6 (patch) | |
| tree | 590d07900b52f148036fd99e1313a222b52cca51 /drivers/video/p9100.c | |
| parent | 8225ccbaf01b459cf1e462047a51b2851e756bc1 (diff) | |
| parent | 9ffb83bcc5c5337f980dc0576bf13ac9bd4fd33d (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
Diffstat (limited to 'drivers/video/p9100.c')
| -rw-r--r-- | drivers/video/p9100.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/video/p9100.c b/drivers/video/p9100.c index 9aaf65fb623a..18bcda23d2cf 100644 --- a/drivers/video/p9100.c +++ b/drivers/video/p9100.c | |||
| @@ -48,6 +48,9 @@ static struct fb_ops p9100_ops = { | |||
| 48 | .fb_imageblit = cfb_imageblit, | 48 | .fb_imageblit = cfb_imageblit, |
| 49 | .fb_mmap = p9100_mmap, | 49 | .fb_mmap = p9100_mmap, |
| 50 | .fb_ioctl = p9100_ioctl, | 50 | .fb_ioctl = p9100_ioctl, |
| 51 | #ifdef CONFIG_COMPAT | ||
| 52 | .fb_compat_ioctl = sbusfb_compat_ioctl, | ||
| 53 | #endif | ||
| 51 | }; | 54 | }; |
| 52 | 55 | ||
| 53 | /* P9100 control registers */ | 56 | /* P9100 control registers */ |