diff options
author | Tony Lindgren <tony@atomide.com> | 2019-08-13 12:40:10 +0200 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2019-08-13 12:40:10 +0200 |
commit | 58e16d792a6a8c6b750f637a4649967fcac853dc (patch) | |
tree | 778a940499ecfc6fb2d811dbfef735913d30618a /arch/x86/boot/video-vesa.c | |
parent | ARM: OMAP1: ams-delta-fiq: Fix missing irq_ack (diff) | |
parent | bus: ti-sysc: Simplify cleanup upon failures in sysc_probe() (diff) | |
download | linux-58e16d792a6a8c6b750f637a4649967fcac853dc.tar.xz linux-58e16d792a6a8c6b750f637a4649967fcac853dc.zip |
Merge branch 'ti-sysc-fixes' into fixes
Diffstat (limited to 'arch/x86/boot/video-vesa.c')
-rw-r--r-- | arch/x86/boot/video-vesa.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/x86/boot/video-vesa.c b/arch/x86/boot/video-vesa.c index 3ecc11a9c440..7e185977a984 100644 --- a/arch/x86/boot/video-vesa.c +++ b/arch/x86/boot/video-vesa.c @@ -1,12 +1,10 @@ +// SPDX-License-Identifier: GPL-2.0-only /* -*- linux-c -*- ------------------------------------------------------- * * * Copyright (C) 1991, 1992 Linus Torvalds * Copyright 2007 rPath, Inc. - All Rights Reserved * Copyright 2009 Intel Corporation; author H. Peter Anvin * - * This file is part of the Linux kernel, and is made available under - * the terms of the GNU General Public License version 2. - * * ----------------------------------------------------------------------- */ /* |