History

Merge tag 'drm-misc-next-fixes-2019-03-13' of git://anongit.freedesktop.org/drm/drm-misc into drm-next

- qxl: Remove the conflicting framebuffers earlier - Split out some i915 code into the fb_helper to allow the above Signed-off-by: Dave Airlie <airlied@redhat.com>

Dave Airlie committed 7 years ago

Commit 74cd45f2 parents 3a7d2f4 c34674a5 files · +67 −38Browse files

Showing the changes to include/linux (1 of 5 files). Show all

Unified · Split

include/linux/vgaarb.h+2−0
@@ -125,9 +125,11 @@ extern void vga_put(struct pci_dev *pdev, unsigned int rsrc); · 124 unmodified lines
125125 #ifdef CONFIG_VGA_ARB
126126 extern struct pci_dev *vga_default_device(void);
127127 extern void vga_set_default_device(struct pci_dev *pdev);
128+extern int vga_remove_vgacon(struct pci_dev *pdev);
128129 #else
129130 static inline struct pci_dev *vga_default_device(void) { return NULL; };
130131 static inline void vga_set_default_device(struct pci_dev *pdev) { };
132+static inline int vga_remove_vgacon(struct pci_dev *pdev) { return 0; };
131133 #endif
132134
133135 /*

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t