From: Michal Piotrowski <michal.k.k.piotrowski@gmail.com>

This is an upgrade to the previous patch.

(drivers-video-sis-sis_mainc-removal-of-old.patch)

Signed-off-by: Michal Piotrowski <michal.k.k.piotrowski@gmail.com>
Cc: "Antonino A. Daplas" <adaplas@pol.net>
Cc: Thomas Winischhofer <thomas@winischhofer.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 drivers/video/sis/sis_main.c |    6 ------
 1 file changed, 6 deletions(-)

diff -puN drivers/video/sis/sis_main.c~drivers-video-sis-sis_mainc-removal-of-old-2 drivers/video/sis/sis_main.c
--- a/drivers/video/sis/sis_main.c~drivers-video-sis-sis_mainc-removal-of-old-2
+++ a/drivers/video/sis/sis_main.c
@@ -83,13 +83,7 @@ sisfb_setdefaultparms(void)
 	sisfb_max		= -1;
 	sisfb_userom		= -1;
 	sisfb_useoem		= -1;
-#ifdef MODULE
-	/* Module: "None" for 2.4, default mode for 2.5+ */
-	sisfb_mode_idx		= -1;
-#else
-	/* Static: Default mode */
 	sisfb_mode_idx		= -1;
-#endif
 	sisfb_parm_rate		= -1;
 	sisfb_crt1off		= 0;
 	sisfb_forcecrt1		= -1;
_