summaryrefslogtreecommitdiff
path: root/drivers/video/cg3.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-11-12 12:23:25 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2005-11-12 12:23:25 -0800
commit9e6c67fd2716720d9029d38ea25884efcfdedeb6 (patch)
tree590d07900b52f148036fd99e1313a222b52cca51 /drivers/video/cg3.c
parent8225ccbaf01b459cf1e462047a51b2851e756bc1 (diff)
parent9ffb83bcc5c5337f980dc0576bf13ac9bd4fd33d (diff)
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
Diffstat (limited to 'drivers/video/cg3.c')
-rw-r--r--drivers/video/cg3.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/video/cg3.c b/drivers/video/cg3.c
index b94eee8c42d5..a1354e7e0513 100644
--- a/drivers/video/cg3.c
+++ b/drivers/video/cg3.c
@@ -50,6 +50,9 @@ static struct fb_ops cg3_ops = {
.fb_imageblit = cfb_imageblit,
.fb_mmap = cg3_mmap,
.fb_ioctl = cg3_ioctl,
+#ifdef CONFIG_COMPAT
+ .fb_compat_ioctl = sbusfb_compat_ioctl,
+#endif
};