summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorBruno Prémont <bonbons@linux-vserver.org>2014-08-24 23:13:15 +0200
committerBjorn Helgaas <bhelgaas@google.com>2014-09-16 15:02:55 -0600
commitce6eacb07e287c0c3c8b5c316a9a7f9cecf69e95 (patch)
tree6eae3c19155b8748d0641133ac3cbe0f4886bb3d /include
parent86fd887b7fe350819dae5b55e7fef05b511c8656 (diff)
vgaarb: Drop obsolete #ifndef
Commit 20cde694027e ("x86, ia64: Move EFI_FB vga_default_device() initialization to pci_vga_fixup()") moved boot video device detection from efifb to x86 and ia64 pci/fixup.c. Remove the left-over #ifndef check that will always match since the corresponding arch-specific define is gone with above patch. Signed-off-by: Bruno Prémont <bonbons@linux-vserver.org> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> CC: Matthew Garrett <matthew.garrett@nebula.com>
Diffstat (limited to 'include')
-rw-r--r--include/linux/vgaarb.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/include/linux/vgaarb.h b/include/linux/vgaarb.h
index 2c02f3a8d2ba..c37bd4d06739 100644
--- a/include/linux/vgaarb.h
+++ b/include/linux/vgaarb.h
@@ -182,7 +182,6 @@ extern void vga_put(struct pci_dev *pdev, unsigned int rsrc);
* vga_get()...
*/
-#ifndef __ARCH_HAS_VGA_DEFAULT_DEVICE
#ifdef CONFIG_VGA_ARB
extern struct pci_dev *vga_default_device(void);
extern void vga_set_default_device(struct pci_dev *pdev);
@@ -190,7 +189,6 @@ extern void vga_set_default_device(struct pci_dev *pdev);
static inline struct pci_dev *vga_default_device(void) { return NULL; };
static inline void vga_set_default_device(struct pci_dev *pdev) { };
#endif
-#endif
/**
* vga_conflicts