Merge branch 'linux-4.7' of git://github.com/skeggsb/linux into drm-fixes

* 'linux-4.7' of git://github.com/skeggsb/linux:
  drm/nouveau: fix for disabled fbdev emulation

drivers/gpu/drm/nouveau/nouveau_fbcon.c

@@ -552,6 +552,7 @@ nouveau_fbcon_init(struct drm_device *dev)
 	if (ret)
 		goto fini;
 
+	if (fbcon->helper.fbdev)
 		fbcon->helper.fbdev->pixmap.buf_align = 4;
 	return 0;