From 2c06cbaadaf1a2447b0a1539b27acc1a8b5f6cfd Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Thu, 17 May 2012 11:17:33 +0100 Subject: [PATCH] --- yaml --- r: 307396 b: refs/heads/master c: 0333592ff9e936c6e5ae143e7418468a3198b54d h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/gma500/psb_device.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 7ccea0184f9a..37b546e6844b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fcf92202e7bc2e8513ae045e3ec61e79c1c9e690 +refs/heads/master: 0333592ff9e936c6e5ae143e7418468a3198b54d diff --git a/trunk/drivers/gpu/drm/gma500/psb_device.c b/trunk/drivers/gpu/drm/gma500/psb_device.c index 6a67cec33845..1726c04dedda 100644 --- a/trunk/drivers/gpu/drm/gma500/psb_device.c +++ b/trunk/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);