aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDave Airlie2012-05-17 11:17:33 +0100
committerDave Airlie2012-05-17 11:17:33 +0100
commit0333592ff9e936c6e5ae143e7418468a3198b54d (patch)
tree8280eb8f205e8e4c4abf8e62e9dfc2bde6566d91
parentfcf92202e7bc2e8513ae045e3ec61e79c1c9e690 (diff)
gma500: fix build warning
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 <airlied@redhat.com>
-rw-r--r--drivers/gpu/drm/gma500/psb_device.c2
1 files changed, 1 insertions, 1 deletions
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);