diff options
| author | Steve French <sfrench@us.ibm.com> | 2005-11-12 22:53:33 -0500 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2005-11-12 22:53:33 -0500 |
| commit | 1b98a8221e3c9c86ae7e292ba7542d2dd6f10eb9 (patch) | |
| tree | 2e0051ccb147b0553d50c14681c50881098859d6 /drivers/video/cg14.c | |
| parent | e89dc9209692293434da45ec31826a55becb91c0 (diff) | |
| parent | 9e6c67fd2716720d9029d38ea25884efcfdedeb6 (diff) | |
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'drivers/video/cg14.c')
| -rw-r--r-- | drivers/video/cg14.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/video/cg14.c b/drivers/video/cg14.c index 030d4b13b1c2..1bed50f2a276 100644 --- a/drivers/video/cg14.c +++ b/drivers/video/cg14.c | |||
| @@ -49,6 +49,9 @@ static struct fb_ops cg14_ops = { | |||
| 49 | .fb_imageblit = cfb_imageblit, | 49 | .fb_imageblit = cfb_imageblit, |
| 50 | .fb_mmap = cg14_mmap, | 50 | .fb_mmap = cg14_mmap, |
| 51 | .fb_ioctl = cg14_ioctl, | 51 | .fb_ioctl = cg14_ioctl, |
| 52 | #ifdef CONFIG_COMPAT | ||
| 53 | .fb_compat_ioctl = sbusfb_compat_ioctl, | ||
| 54 | #endif | ||
| 52 | }; | 55 | }; |
| 53 | 56 | ||
| 54 | #define CG14_MCR_INTENABLE_SHIFT 7 | 57 | #define CG14_MCR_INTENABLE_SHIFT 7 |