diff --git a/[refs] b/[refs]
index f0dac983e32a..f7ff221c7fa9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: aa53f5331c4ea156b6479c6e4d9a5d35528ac1eb
+refs/heads/master: 017350bcb065ba72b776b99fdf26a6ce60bf703a
diff --git a/trunk/drivers/gpu/drm/gma500/cdv_device.h b/trunk/drivers/gpu/drm/gma500/cdv_device.h
index 2a88b7beb551..9561e17621b3 100644
--- a/trunk/drivers/gpu/drm/gma500/cdv_device.h
+++ b/trunk/drivers/gpu/drm/gma500/cdv_device.h
@@ -26,7 +26,7 @@ extern void cdv_hdmi_init(struct drm_device *dev, struct psb_intel_mode_device *
 extern struct drm_display_mode *cdv_intel_crtc_mode_get(struct drm_device *dev,
 					     struct drm_crtc *crtc);
 
-extern inline void cdv_intel_wait_for_vblank(struct drm_device *dev)
+static inline void cdv_intel_wait_for_vblank(struct drm_device *dev)
 {
 	/* Wait for 20ms, i.e. one cycle at 50hz. */
         /* FIXME: msleep ?? */