diff --git a/[refs] b/[refs] index 9ab14a9973c4..602d316fa174 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 602286469cebc9dcd6391eb33199736b15b82483 +refs/heads/master: b0e77f45a6da3f361d69680baeb0e133d0bc46c0 diff --git a/trunk/drivers/gpu/drm/mgag200/mgag200_main.c b/trunk/drivers/gpu/drm/mgag200/mgag200_main.c index 857d71be9f0c..70dd3c5529d4 100644 --- a/trunk/drivers/gpu/drm/mgag200/mgag200_main.c +++ b/trunk/drivers/gpu/drm/mgag200/mgag200_main.c @@ -142,7 +142,6 @@ static int mga_vram_init(struct mga_device *mdev) aper->ranges[0].base = mdev->mc.vram_base; aper->ranges[0].size = mdev->mc.vram_window; - aper->count = 1; remove_conflicting_framebuffers(aper, "mgafb", true); kfree(aper);