From 0333592ff9e936c6e5ae143e7418468a3198b54d Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Thu, 17 May 2012 11:17:33 +0100 Subject: [PATCH] gma500: fix build warning MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit CC [M] drivers/gpu/drm/i915/i915_gem_evict.o /ssd/git/drm-core-next/drivers/gpu/drm/gma500/psb_device.c: In function ‘psb_chip_errata’: /ssd/git/drm-core-next/drivers/gpu/drm/gma500/psb_device.c:360:1: warning: no return statement in function returning non-void [-Wreturn-type] /ssd/git/drm-core-next/drivers/gpu/drm/gma500/psb_device.c: At top level: /ssd/git/drm-core-next/drivers/gpu/drm/gma500/psb_device.c:379:2: warning: initialization from incompatible pointer type [enabled by default] /ssd/git/drm-core-next/drivers/gpu/drm/gma500/psb_device.c:379:2: warning: (near initialization for ‘psb_chip_ops.errata’) [enabled by default] Signed-off-by: Dave Airlie --- drivers/gpu/drm/gma500/psb_device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/gma500/psb_device.c b/drivers/gpu/drm/gma500/psb_device.c index 6a67cec33845..1726c04dedda 100644 --- a/drivers/gpu/drm/gma500/psb_device.c +++ b/drivers/gpu/drm/gma500/psb_device.c @@ -353,7 +353,7 @@ static int psb_chip_setup(struct drm_device *dev) } /* Not exactly an erratum more an irritation */ -static int psb_chip_errata(struct drm_device *dev) +static void psb_chip_errata(struct drm_device *dev) { struct drm_psb_private *dev_priv = dev->dev_private; psb_lid_timer_init(dev_priv); -- 2.20.1