From 77f0ae776c6e42ff5e9f22c4af8f5ff8b83e3536 Mon Sep 17 00:00:00 2001 From: Michal Piotrowski Date: Tue, 3 Oct 2006 01:14:59 -0700 Subject: [PATCH] --- yaml --- r: 38066 b: refs/heads/master c: 2dc350283d3ea194c954428d86025190cab47366 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/video/sis/sis_accel.h | 14 -------------- 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/[refs] b/[refs] index d3269bbd7e2f..30d3713a660e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 882e6afd71a7cd8c2f97067bb819eaa310540e36 +refs/heads/master: 2dc350283d3ea194c954428d86025190cab47366 diff --git a/trunk/drivers/video/sis/sis_accel.h b/trunk/drivers/video/sis/sis_accel.h index 046e2c4a8e09..30e03cdf6b85 100644 --- a/trunk/drivers/video/sis/sis_accel.h +++ b/trunk/drivers/video/sis/sis_accel.h @@ -390,25 +390,11 @@ MMIO_OUT32(ivideo->mmio_vbase, FIRE_TRIGGER, 0); \ CmdQueLen -= 2; - int sisfb_initaccel(struct sis_video_info *ivideo); void sisfb_syncaccel(struct sis_video_info *ivideo); -#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,5,33) -void fbcon_sis_bmove(struct display *p, int srcy, int srcx, int dsty, - int dstx, int height, int width); -void fbcon_sis_revc(struct display *p, int srcy, int srcx); -void fbcon_sis_clear8(struct vc_data *conp, struct display *p, int srcy, - int srcx, int height, int width); -void fbcon_sis_clear16(struct vc_data *conp, struct display *p, int srcy, - int srcx, int height, int width); -void fbcon_sis_clear32(struct vc_data *conp, struct display *p, int srcy, - int srcx, int height, int width); -#endif -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,34) int fbcon_sis_sync(struct fb_info *info); void fbcon_sis_fillrect(struct fb_info *info, const struct fb_fillrect *rect); void fbcon_sis_copyarea(struct fb_info *info, const struct fb_copyarea *area); -#endif #endif