From bbbb13195eaecb7e0ddf35ac2b57ce29ffcbe2df Mon Sep 17 00:00:00 2001 From: Alan Cox Date: Tue, 5 Jul 2011 15:40:56 +0100 Subject: [PATCH] --- yaml --- r: 259685 b: refs/heads/master c: 1ff6d5fe7c06937c250ed1644077ac0ad74d8aa4 h: refs/heads/master i: 259683: 751c36a0baa91250ce5b762d73e828a5ffe969d8 v: v3 --- [refs] | 2 +- trunk/drivers/staging/gma500/psb_fb.c | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index fd619c419848..1a9a3517b70a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 35efdaeffce2232a603596631d15f1fff028dbf6 +refs/heads/master: 1ff6d5fe7c06937c250ed1644077ac0ad74d8aa4 diff --git a/trunk/drivers/staging/gma500/psb_fb.c b/trunk/drivers/staging/gma500/psb_fb.c index 349fff850a18..17c3cf6388b5 100644 --- a/trunk/drivers/staging/gma500/psb_fb.c +++ b/trunk/drivers/staging/gma500/psb_fb.c @@ -591,7 +591,6 @@ int psb_fbdev_init(struct drm_device *dev) { struct psb_fbdev *fbdev; struct drm_psb_private *dev_priv = dev->dev_private; - int num_crtc; fbdev = kzalloc(sizeof(struct psb_fbdev), GFP_KERNEL); if (!fbdev) { @@ -602,10 +601,7 @@ int psb_fbdev_init(struct drm_device *dev) dev_priv->fbdev = fbdev; fbdev->psb_fb_helper.funcs = &psb_fb_helper_funcs; - /* FIXME: check Medfield */ - num_crtc = 2; - - drm_fb_helper_init(dev, &fbdev->psb_fb_helper, num_crtc, + drm_fb_helper_init(dev, &fbdev->psb_fb_helper, 2, INTELFB_CONN_LIMIT); drm_fb_helper_single_add_all_connectors(&fbdev->psb_fb_helper);