diff --git a/[refs] b/[refs]
index b3e6448a2991..5bb5d601b801 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: aeaecaf8eba9efa6a0a623122abb8f61449e42ef
+refs/heads/master: 32929fb4c7c4a693ed723253b21e7bf3c8cb4b1c
diff --git a/trunk/drivers/media/video/em28xx/em28xx.h b/trunk/drivers/media/video/em28xx/em28xx.h
index 23d1482df2d1..e15ca2f0fb11 100644
--- a/trunk/drivers/media/video/em28xx/em28xx.h
+++ b/trunk/drivers/media/video/em28xx/em28xx.h
@@ -321,7 +321,7 @@ enum em28xx_aout {
 	EM28XX_AOUT_PCM_PHONE	= 7 << 8,
 };
 
-static int ac97_return_record_select(int a_out)
+static inline int ac97_return_record_select(int a_out)
 {
 	return (a_out & 0x700) >> 8;
 }