Re: [2.5 patch] move an unused variable in sis_main.c

[Adrian Bunk]

On Thu, Jul 03, 2003 at 12:47:00PM +0200, maximilian attems wrote:
> The patch below moves an used variable from drivers/video/sis/sis_main.c
> 
> i've tested the compilation with 2.5.74
> 
> please apply
> maks
> 
> 
> --- linux-2.5.74/drivers/video/sis/sis_main.c	Wed Jul  2 22:50:59 2003
> +++ linux/drivers/video/sis/sis_main.c	Thu Jul  3 12:06:58 2003
> @@ -619,11 +619,11 @@
>  	double drate = 0, hrate = 0;
>  	int found_mode = 0;
>  	int old_mode;
> -	unsigned char reg;
>  
>  	TWDEBUG("Inside do_set_var");
>  	
>  #if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)	
> +	unsigned char reg;
>  	inSISIDXREG(SISCR,0x34,reg);
>  	if(reg & 0x80) {
>  	   printk(KERN_INFO "sisfb: Cannot change display mode, X server is active\n");

If TWDEBUG does anything your patch breaks the compilation on kernel 2.4 
with gcc 2.95 .

cu
Adrian

-- 

       "Is there not promise of rain?" Ling Tan asked suddenly out
        of the darkness. There had been need of rain for many days.
       "Only a promise," Lao Er said.
                                       Pearl S. Buck - Dragon Seed