Merge remote-tracking branch 'drm-misc/topic/drm-misc'

diff --combined drivers/gpu/drm/tegra/fb.c
index 1004075fd0883b42786a60c76fd82622148e3e2b,9b8aa967fa714b8c793b521b6eef551c5baf5de8..bec07d934b3b2f10f9ca725e6c5eeaf1c7be1243
--- 1/drivers/gpu/drm/tegra/fb.c
--- 2/drivers/gpu/drm/tegra/fb.c
+++ b/drivers/gpu/drm/tegra/fb.c
@@@ -18,7 -18,7 +18,7 @@@ static inline struct tegra_fb *to_tegra
        return container_of(fb, struct tegra_fb, base);
  }
  
- #ifdef CONFIG_DRM_TEGRA_FBDEV
+ #ifdef CONFIG_DRM_FBDEV_EMULATION
  static inline struct tegra_fbdev *to_tegra_fbdev(struct drm_fb_helper *helper)
  {
        return container_of(helper, struct tegra_fbdev, base);
@@@ -181,7 -181,7 +181,7 @@@ unreference
        return ERR_PTR(err);
  }
  
- #ifdef CONFIG_DRM_TEGRA_FBDEV
+ #ifdef CONFIG_DRM_FBDEV_EMULATION
  static struct fb_ops tegra_fb_ops = {
        .owner = THIS_MODULE,
        .fb_fillrect = drm_fb_helper_sys_fillrect,
@@@ -341,6 -341,7 +341,6 @@@ fini
  
  static void tegra_fbdev_exit(struct tegra_fbdev *fbdev)
  {
 -
        drm_fb_helper_unregister_fbi(&fbdev->base);
        drm_fb_helper_release_fbi(&fbdev->base);
  
@@@ -370,7 -371,7 +370,7 @@@ void tegra_fb_output_poll_changed(struc
  
  int tegra_drm_fb_prepare(struct drm_device *drm)
  {
- #ifdef CONFIG_DRM_TEGRA_FBDEV
+ #ifdef CONFIG_DRM_FBDEV_EMULATION
        struct tegra_drm *tegra = drm->dev_private;
  
        tegra->fbdev = tegra_fbdev_create(drm);
@@@ -383,7 -384,7 +383,7 @@@
  
  void tegra_drm_fb_free(struct drm_device *drm)
  {
- #ifdef CONFIG_DRM_TEGRA_FBDEV
+ #ifdef CONFIG_DRM_FBDEV_EMULATION
        struct tegra_drm *tegra = drm->dev_private;
  
        tegra_fbdev_free(tegra->fbdev);
@@@ -392,7 -393,7 +392,7 @@@
  
  int tegra_drm_fb_init(struct drm_device *drm)
  {
- #ifdef CONFIG_DRM_TEGRA_FBDEV
+ #ifdef CONFIG_DRM_FBDEV_EMULATION
        struct tegra_drm *tegra = drm->dev_private;
        int err;
  
@@@ -407,7 -408,7 +407,7 @@@
  
  void tegra_drm_fb_exit(struct drm_device *drm)
  {
- #ifdef CONFIG_DRM_TEGRA_FBDEV
+ #ifdef CONFIG_DRM_FBDEV_EMULATION
        struct tegra_drm *tegra = drm->dev_private;
  
        tegra_fbdev_exit(tegra->fbdev);