diff options
| author | Christoph Egger <siccegge@stud.informatik.uni-erlangen.de> | 2010-03-10 15:21:46 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-12 15:52:34 -0800 |
| commit | 91d4e0a4c889e3e8078c26542b8f5a322b87adf4 (patch) | |
| tree | c7dc5def96725767ebafbe7a1b61f5460bc85354 /drivers/video | |
| parent | 55a23c4af83df9c8fdf55690a09a3f0a92bd127b (diff) | |
| download | linux-3.10-91d4e0a4c889e3e8078c26542b8f5a322b87adf4.tar.gz linux-3.10-91d4e0a4c889e3e8078c26542b8f5a322b87adf4.tar.bz2 linux-3.10-91d4e0a4c889e3e8078c26542b8f5a322b87adf4.zip | |
fbdev: remove obsolete CONFIG_FB_SOFT_CURSOR
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>
Diffstat (limited to 'drivers/video')
| -rw-r--r-- | drivers/video/Kconfig | 1 | ||||
| -rw-r--r-- | drivers/video/sis/sis_main.c | 3 |
2 files changed, 0 insertions, 4 deletions
diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig index 5a5c303a637..7fe18390c58 100644 --- a/drivers/video/Kconfig +++ b/drivers/video/Kconfig @@ -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 diff --git a/drivers/video/sis/sis_main.c b/drivers/video/sis/sis_main.c index 9d2b6bc4903..a531a0f7cdf 100644 --- a/drivers/video/sis/sis_main.c +++ b/drivers/video/sis/sis_main.c @@ -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, |