diff options
| author | Jody McIntyre <scjody@modernduck.com> | 2005-11-18 00:18:25 -0500 |
|---|---|---|
| committer | Jody McIntyre <scjody@modernduck.com> | 2005-11-18 00:18:25 -0500 |
| commit | a9931a6e37c09f6b76a9fa0cbd777c335548692b (patch) | |
| tree | cd6ba9d36e350dd6188f7b8f95efc59c85d34485 /drivers/video/p9100.c | |
| parent | 7301c8d3a05dc52d33598364da7c4eb6ab6357eb (diff) | |
| parent | 811803c5572b296e0031e0099203de90d77c7bcf (diff) | |
Merge with http://kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'drivers/video/p9100.c')
| -rw-r--r-- | drivers/video/p9100.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/video/p9100.c b/drivers/video/p9100.c index b76a5a9a125..18bcda23d2c 100644 --- a/drivers/video/p9100.c +++ b/drivers/video/p9100.c @@ -48,7 +48,9 @@ static struct fb_ops p9100_ops = { .fb_imageblit = cfb_imageblit, .fb_mmap = p9100_mmap, .fb_ioctl = p9100_ioctl, - .fb_cursor = soft_cursor, +#ifdef CONFIG_COMPAT + .fb_compat_ioctl = sbusfb_compat_ioctl, +#endif }; /* P9100 control registers */ |