| Message ID | 1410688110-11042-1-git-send-email-geert@linux-m68k.org (mailing list archive) |
|---|---|
| State | Awaiting Upstream, archived |
| Headers | show |
On 14/09/14 12:48, Geert Uytterhoeven wrote: > If CONFIG_ADB_CUDA=n: > > drivers/video/fbdev/valkyriefb.c: In function ‘set_valkyrie_clock’: > drivers/video/fbdev/valkyriefb.c:267: warning: unused variable ‘i’ > drivers/video/fbdev/valkyriefb.c:266: warning: unused variable ‘req’ > > Move the variable declarations inside the existing #ifdef section to fix > this. > > Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org> > --- > drivers/video/fbdev/valkyriefb.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/video/fbdev/valkyriefb.c b/drivers/video/fbdev/valkyriefb.c > index 97cb9bd1d1dd..b6ed09f16355 100644 > --- a/drivers/video/fbdev/valkyriefb.c > +++ b/drivers/video/fbdev/valkyriefb.c > @@ -263,10 +263,10 @@ static inline int valkyrie_vram_reqd(int video_mode, int color_mode) > > static void set_valkyrie_clock(unsigned char *params) > { > +#ifdef CONFIG_ADB_CUDA > struct adb_request req; > int i; > > -#ifdef CONFIG_ADB_CUDA > for (i = 0; i < 3; ++i) { > cuda_request(&req, NULL, 5, CUDA_PACKET, CUDA_GET_SET_IIC, > 0x50, i + 1, params[i]); > Thanks, queued for 3.18. Tomi
diff --git a/drivers/video/fbdev/valkyriefb.c b/drivers/video/fbdev/valkyriefb.c index 97cb9bd1d1dd..b6ed09f16355 100644 --- a/drivers/video/fbdev/valkyriefb.c +++ b/drivers/video/fbdev/valkyriefb.c @@ -263,10 +263,10 @@ static inline int valkyrie_vram_reqd(int video_mode, int color_mode) static void set_valkyrie_clock(unsigned char *params) { +#ifdef CONFIG_ADB_CUDA struct adb_request req; int i; -#ifdef CONFIG_ADB_CUDA for (i = 0; i < 3; ++i) { cuda_request(&req, NULL, 5, CUDA_PACKET, CUDA_GET_SET_IIC, 0x50, i + 1, params[i]);
If CONFIG_ADB_CUDA=n: drivers/video/fbdev/valkyriefb.c: In function ‘set_valkyrie_clock’: drivers/video/fbdev/valkyriefb.c:267: warning: unused variable ‘i’ drivers/video/fbdev/valkyriefb.c:266: warning: unused variable ‘req’ Move the variable declarations inside the existing #ifdef section to fix this. Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org> --- drivers/video/fbdev/valkyriefb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)