aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/video/leo.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-11-12 15:23:25 -0500
committerLinus Torvalds <torvalds@g5.osdl.org>2005-11-12 15:23:25 -0500
commit9e6c67fd2716720d9029d38ea25884efcfdedeb6 (patch)
tree590d07900b52f148036fd99e1313a222b52cca51 /drivers/video/leo.c
parent8225ccbaf01b459cf1e462047a51b2851e756bc1 (diff)
parent9ffb83bcc5c5337f980dc0576bf13ac9bd4fd33d (diff)
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
Diffstat (limited to 'drivers/video/leo.c')
-rw-r--r--drivers/video/leo.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/video/leo.c b/drivers/video/leo.c
index 84a7fe435bb8..376d4a171ec7 100644
--- a/drivers/video/leo.c
+++ b/drivers/video/leo.c
@@ -51,6 +51,9 @@ static struct fb_ops leo_ops = {
51 .fb_imageblit = cfb_imageblit, 51 .fb_imageblit = cfb_imageblit,
52 .fb_mmap = leo_mmap, 52 .fb_mmap = leo_mmap,
53 .fb_ioctl = leo_ioctl, 53 .fb_ioctl = leo_ioctl,
54#ifdef CONFIG_COMPAT
55 .fb_compat_ioctl = sbusfb_compat_ioctl,
56#endif
54}; 57};
55 58
56#define LEO_OFF_LC_SS0_KRN 0x00200000UL 59#define LEO_OFF_LC_SS0_KRN 0x00200000UL