diff options
author | 2015-12-17 22:08:28 -0500 | |
---|---|---|
committer | 2015-12-17 22:08:28 -0500 | |
commit | b3e0d3d7bab14f2544a3314bec53a23dc7dd2206 (patch) | |
tree | 2bd3c1c1d128e0c362655fa70a6eea02fc856f62 /arch/x86/boot/video-mode.c | |
parent | team: Advertise tunneling offload features (diff) | |
parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff) | |
download | linux-dev-b3e0d3d7bab14f2544a3314bec53a23dc7dd2206.tar.xz linux-dev-b3e0d3d7bab14f2544a3314bec53a23dc7dd2206.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
drivers/net/geneve.c
Here we had an overlapping change, where in 'net' the extraneous stats
bump was being removed whilst in 'net-next' the final argument to
udp_tunnel6_xmit_skb() was being changed.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/x86/boot/video-mode.c')
-rw-r--r-- | arch/x86/boot/video-mode.c | 2 |
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 */ |