summaryrefslogtreecommitdiffstats
path: root/arch/x86/boot/video.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2015-12-21 11:46:30 +0100
committerTakashi Iwai <tiwai@suse.de>2015-12-21 11:46:30 +0100
commit1d9d4495001d3c470e5c902ff35a6aa626924fc1 (patch)
tree1ae39f4ccadb610bc16fea88a1f93b23a4df37b1 /arch/x86/boot/video.c
parentALSA: fm801: store struct device instead of pci_dev (diff)
parentALSA: hda - Move audio component accesses to hdac_i915.c (diff)
downloadlinux-1d9d4495001d3c470e5c902ff35a6aa626924fc1.tar.xz
linux-1d9d4495001d3c470e5c902ff35a6aa626924fc1.zip
Merge branch 'topic/hdmi-jack' into for-next
Diffstat (limited to 'arch/x86/boot/video.c')
-rw-r--r--arch/x86/boot/video.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/x86/boot/video.c b/arch/x86/boot/video.c
index 05111bb8d018..77780e386e9b 100644
--- a/arch/x86/boot/video.c
+++ b/arch/x86/boot/video.c
@@ -13,6 +13,8 @@
* Select video mode
*/
+#include <uapi/asm/boot.h>
+
#include "boot.h"
#include "video.h"
#include "vesa.h"