Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 259685
b: refs/heads/master
c: 1ff6d5f
h: refs/heads/master
i:
  259683: 751c36a
v: v3
  • Loading branch information
Alan Cox authored and Greg Kroah-Hartman committed Jul 5, 2011
1 parent dc37dd1 commit bbbb131
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 6 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 35efdaeffce2232a603596631d15f1fff028dbf6
refs/heads/master: 1ff6d5fe7c06937c250ed1644077ac0ad74d8aa4
6 changes: 1 addition & 5 deletions trunk/drivers/staging/gma500/psb_fb.c
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand All @@ -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);
Expand Down

0 comments on commit bbbb131

Please sign in to comment.