2.6.1-rc1-mm2: warning in drivers/net/sk98lin/skge.c

[Adrian Bunk]

On Mon, Jan 05, 2004 at 12:20:56AM -0800, Andrew Morton wrote:
>...
> All 253 patches
>...
> 2.6.0-rc1-netdrvr-exp1.patch
>...

I got the following compile warning:

<--  snip  -->

...
  CC      drivers/net/sk98lin/skge.o
drivers/net/sk98lin/skge.c: In function `skge_probe':
drivers/net/sk98lin/skge.c:713: warning: unused variable `proc_root_initialized'
...

<--  snip  -->


2.6.0-rc1-netdrvr-exp1.patch contains

--- 25/drivers/net/sk98lin/skge.c~2.6.0-rc1-netdrvr-exp1        2004-01-03 14:07:17.000000000 -0800
+++ 25-akpm/drivers/net/sk98lin/skge.c  2004-01-03 14:07:18.000000000 -0800
...
 #ifdef CONFIG_PROC_FS
+       int                     proc_root_initialized = 0;
        struct proc_dir_entry   *pProcFile;
 #endif
...


but no other occurence of proc_root_initialized where it would be used.


Is this some kind of merge error?


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

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/