summaryrefslogtreecommitdiffstats
path: root/drivers/video/s1d13xxxfb.c
diff options
context:
space:
mode:
authorTony Luck <tony.luck@intel.com>2005-11-07 18:05:22 +0100
committerTony Luck <tony.luck@intel.com>2005-11-07 18:05:22 +0100
commit0ad3a96f8ad910ecf87a25ec69ed360b284dee2e (patch)
tree12d292fd58fc0f7a3eb56c89dfc23569f3ab6c00 /drivers/video/s1d13xxxfb.c
parent[IA64] restrict CONFIG_SGI_SN_XP to IA64_GENERIC or IA64_SGI_SN2 (diff)
parentMerge master.kernel.org:/pub/scm/linux/kernel/git/bunk/trivial (diff)
downloadlinux-0ad3a96f8ad910ecf87a25ec69ed360b284dee2e.tar.xz
linux-0ad3a96f8ad910ecf87a25ec69ed360b284dee2e.zip
Auto-update from upstream
Diffstat (limited to 'drivers/video/s1d13xxxfb.c')
-rw-r--r--drivers/video/s1d13xxxfb.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/video/s1d13xxxfb.c b/drivers/video/s1d13xxxfb.c
index f4437430dc5f..3edbd14c5c46 100644
--- a/drivers/video/s1d13xxxfb.c
+++ b/drivers/video/s1d13xxxfb.c
@@ -388,7 +388,6 @@ static struct fb_ops s1d13xxxfb_fbops = {
.fb_fillrect = cfb_fillrect,
.fb_copyarea = cfb_copyarea,
.fb_imageblit = cfb_imageblit,
- .fb_cursor = soft_cursor
};
static int s1d13xxxfb_width_tab[2][4] __devinitdata = {