Merge branch 'master' into csb1725

[mv-sheeva.git] / drivers / video / via / accel.h

diff --git a/drivers/video/via/accel.h b/drivers/video/via/accel.h
index 2c122d2923654a1874177699cc703a782782dd4a..79d5e10cc83575fba00d0b8adb2ec2e290d3cdc8 100644 (file)
--- a/drivers/video/via/accel.h
+++ b/drivers/video/via/accel.h
@@ -203,7 +203,8 @@
 #define VIA_BITBLT_MONO                2
 #define VIA_BITBLT_FILL                3
 
-int viafb_init_engine(struct fb_info *info);
+int viafb_setup_engine(struct fb_info *info);
+void viafb_reset_engine(struct viafb_par *viapar);
 void viafb_show_hw_cursor(struct fb_info *info, int Status);
 void viafb_wait_engine_idle(struct fb_info *info);