summaryrefslogtreecommitdiff
path: root/arch/x86/boot/video-mode.c
diff options
context:
space:
mode:
authorMike Marshall <hubcap@omnibond.com>2016-01-15 22:22:14 +0300
committerMike Marshall <hubcap@omnibond.com>2016-01-15 22:22:14 +0300
commit5e1f3938f9e4ef539031d639879cb1cea870fab5 (patch)
treeb262a7c002b05b7bc800a106d6ca6777dabe15bf /arch/x86/boot/video-mode.c
parent1808f8cc6cb2842c53147eccfd5e88044d0d22a6 (diff)
parentafd2ff9b7e1b367172f18ba7f693dfb62bdcb2dc (diff)
downloadlinux-5e1f3938f9e4ef539031d639879cb1cea870fab5.tar.xz
Orangefs: merge with V4.4
Merge tag 'v4.4' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into current Linux 4.4
Diffstat (limited to 'arch/x86/boot/video-mode.c')
-rw-r--r--arch/x86/boot/video-mode.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/x86/boot/video-mode.c b/arch/x86/boot/video-mode.c
index aa8a96b052e3..95c7a818c0ed 100644
--- a/arch/x86/boot/video-mode.c
+++ b/arch/x86/boot/video-mode.c
@@ -19,6 +19,8 @@
#include "video.h"
#include "vesa.h"
+#include <uapi/asm/boot.h>
+
/*
* Common variables
*/