From 1ba629eeed908fd4821ce9dcc0768eec09309135 Mon Sep 17 00:00:00 2001 From: "Kirill A. Shutemov" Date: Thu, 8 Mar 2012 16:09:33 +0000 Subject: [PATCH] --- yaml --- r: 293695 b: refs/heads/master c: 017350bcb065ba72b776b99fdf26a6ce60bf703a h: refs/heads/master i: 293693: edae66db407b45dfa1e1f3cf9228725e5e78e997 293691: be1cadb1ae5c8e155eadfbe722245517af34e1ce 293687: 58043d9ee4a440cb0808bf658937f7bec87636fd 293679: 554041a7d411fe6095ff85329bde42d8bbe5b6f4 293663: 23b5a6c4cf2938c3b6013f95e351dcafed374cf2 293631: 02d54ed3fb7fb2debbbc0d1da4af203f0bd08825 v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/gma500/cdv_device.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 ?? */