fix compiling with gcc-4.6

Change-Id: I7c4ddf3826396746fd1d32220a817a8d8ed9cdef
CyanogenMod · Sep 9, 2012 · 98590a8 · 98590a8
1 parent 823c6f1
commit 98590a8
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/Makefile b/Makefile
@@ -352,7 +352,8 @@ KBUILD_CFLAGS   := -Wall -Wundef -Wstrict-prototypes -Wno-trigraphs \
 		   -fno-strict-aliasing -fno-common \
 		   -Werror-implicit-function-declaration \
 		   -Wno-format-security \
-		   -fno-delete-null-pointer-checks
+		   -fno-delete-null-pointer-checks \
+		   -Wno-unused-but-set-variable
 KBUILD_AFLAGS   := -D__ASSEMBLY__
 
 # Read KERNELRELEASE from include/config/kernel.release (if it exists)

diff --git a/drivers/media/video/samsung/tv20/s5p_stda_grp.c b/drivers/media/video/samsung/tv20/s5p_stda_grp.c
@@ -610,8 +610,7 @@ int s5ptvfb_set_par(struct fb_info *fb)
 #endif
 	}
 
-	((struct fb_var_screeninfo) (s5ptv_status.fb->var)).bits_per_pixel =
-		((struct fb_var_screeninfo) (fb->var)).bits_per_pixel;
+	(s5ptv_status.fb->var).bits_per_pixel = (fb->var).bits_per_pixel;
 
 	s5ptvfb_set_display_mode(&s5ptv_status);
 

diff --git a/sound/soc/codecs/wm8994.h b/sound/soc/codecs/wm8994.h
@@ -136,7 +136,7 @@ struct wm8994_priv {
 	printk (KERN_ERR "[ "SUBJECT " (%s,%d) ] " format "\n", __func__, __LINE__, ## __VA_ARGS__);
 
 // Definitions of function prototype.
-inline unsigned int wm8994_read(struct snd_soc_codec *codec,unsigned int reg);
+unsigned int wm8994_read(struct snd_soc_codec *codec,unsigned int reg);
 int wm8994_write(struct snd_soc_codec *codec, unsigned int reg, unsigned int value);
 void wm8994_shutdown(struct snd_pcm_substream *substream, struct snd_soc_dai *codec_dai);
 int audio_init(void);