diff options
Diffstat (limited to 'drivers/video/fbdev')
| -rw-r--r-- | drivers/video/fbdev/core/fbcon.c | 8 | ||||
| -rw-r--r-- | drivers/video/fbdev/efifb.c | 2 |
2 files changed, 1 insertions, 9 deletions
diff --git a/drivers/video/fbdev/core/fbcon.c b/drivers/video/fbdev/core/fbcon.c index 01715873ea49..615fa596b7cc 100644 --- a/drivers/video/fbdev/core/fbcon.c +++ b/drivers/video/fbdev/core/fbcon.c @@ -78,7 +78,6 @@ #include <linux/interrupt.h> #include <linux/crc32.h> /* For counting font checksums */ #include <linux/uaccess.h> -#include <linux/vga_switcheroo.h> #include <asm/irq.h> #include "fbcon.h" @@ -2883,9 +2882,6 @@ void fbcon_fb_unregistered(struct fb_info *info) console_lock(); - if (info->device && dev_is_pci(info->device)) - vga_switcheroo_client_fb_set(to_pci_dev(info->device), NULL); - fbcon_registered_fb[info->node] = NULL; fbcon_num_registered_fb--; @@ -3019,10 +3015,6 @@ static int do_fb_registered(struct fb_info *info) } } - /* Set the fb info for vga_switcheroo clients. Does nothing otherwise. */ - if (info->device && dev_is_pci(info->device)) - vga_switcheroo_client_fb_set(to_pci_dev(info->device), info); - return ret; } diff --git a/drivers/video/fbdev/efifb.c b/drivers/video/fbdev/efifb.c index ad8dec7807c3..3411be06d3e6 100644 --- a/drivers/video/fbdev/efifb.c +++ b/drivers/video/fbdev/efifb.c @@ -18,8 +18,8 @@ #include <linux/sysfb.h> #include <video/vga.h> #include <asm/efi.h> -#include <drm/drm_utils.h> /* For drm_get_panel_orientation_quirk */ #include <drm/drm_connector.h> /* For DRM_MODE_PANEL_ORIENTATION_* */ +#include <drm/drm_panel_quirks.h> /* For drm_get_panel_orientation_quirk */ struct bmp_file_header { u16 id; |