fbdev: remove obsolete CONFIG_FB_SOFT_CURSOR
authorChristoph Egger <siccegge@stud.informatik.uni-erlangen.de>
Wed, 10 Mar 2010 23:21:46 +0000 (15:21 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 12 Mar 2010 23:52:34 +0000 (15:52 -0800)
The config Option FB_SOFT_BUFFER was removed in
c465e05a03209651078b95686158648fd7ed84c5 ("fbcon/fbdev: Move softcursor
out of fbdev to fbcon").

While moving to fbcon this single driver has it left as a select in
KConfig / #ifdef in source.  This last occurence is removed here so the
option is really gone

Signed-off-by: Christoph Egger <siccegge@stud.informatik.uni-erlangen.de>
Cc: Krzysztof Helt <krzysztof.h1@poczta.fm>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
drivers/video/Kconfig
drivers/video/sis/sis_main.c

index 5a5c303a6373501a4de9fcd8a0ad475bc081f539..7fe18390c5876c0ee30c71e1cc33e24519c8aed9 100644 (file)
@@ -1494,7 +1494,6 @@ config FB_VIA
        select FB_CFB_FILLRECT
        select FB_CFB_COPYAREA
        select FB_CFB_IMAGEBLIT
-       select FB_SOFT_CURSOR
        select I2C_ALGOBIT
        select I2C
        help
index 9d2b6bc49036ee44a92d0dd1c448d975d38d0046..a531a0f7cdf2d7ba27e0f44b8028efa0307d7ab2 100644 (file)
@@ -1891,9 +1891,6 @@ static struct fb_ops sisfb_ops = {
        .fb_fillrect    = fbcon_sis_fillrect,
        .fb_copyarea    = fbcon_sis_copyarea,
        .fb_imageblit   = cfb_imageblit,
-#ifdef CONFIG_FB_SOFT_CURSOR
-       .fb_cursor      = soft_cursor,
-#endif
        .fb_sync        = fbcon_sis_sync,
 #ifdef SIS_NEW_CONFIG_COMPAT
        .fb_compat_ioctl= sisfb_ioctl,