diff options
author | Steve French <sfrench@us.ibm.com> | 2005-11-09 23:33:22 +0100 |
---|---|---|
committer | Steve French <sfrench@us.ibm.com> | 2005-11-09 23:33:22 +0100 |
commit | e82b3aec8d508d2a925a4c766e97f16b7c4dfb1b (patch) | |
tree | 69d5685ef0c194f651a03e30bff14628b4d45400 /drivers/video/cg14.c | |
parent | [CIFS] Update kconfig for cifs (diff) | |
parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sha... (diff) | |
download | linux-e82b3aec8d508d2a925a4c766e97f16b7c4dfb1b.tar.xz linux-e82b3aec8d508d2a925a4c766e97f16b7c4dfb1b.zip |
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 | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/video/cg14.c b/drivers/video/cg14.c index 18e60b941e21..030d4b13b1c2 100644 --- a/drivers/video/cg14.c +++ b/drivers/video/cg14.c @@ -49,7 +49,6 @@ static struct fb_ops cg14_ops = { .fb_imageblit = cfb_imageblit, .fb_mmap = cg14_mmap, .fb_ioctl = cg14_ioctl, - .fb_cursor = soft_cursor, }; #define CG14_MCR_INTENABLE_SHIFT 7 |