summaryrefslogtreecommitdiff
path: root/include/media/davinci/vpbe_osd.h
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-06-23 14:29:03 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-06-23 14:29:03 +0300
commit90b45399b4418a3542fe096b92840b3bf235e78e (patch)
treea75e3e37503be4fe4c7d718248bd5a844c8705e1 /include/media/davinci/vpbe_osd.h
parente39956c0d35efc36acbead9fc624a9ffd7d7ab82 (diff)
parent4b972a01a7da614b4796475f933094751a295a2f (diff)
downloadlinux-90b45399b4418a3542fe096b92840b3bf235e78e.tar.xz
Merge 5.2-rc6 into staging-next
We want the fixes and this resolves a merge issue as well. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include/media/davinci/vpbe_osd.h')
-rw-r--r--include/media/davinci/vpbe_osd.h11
1 files changed, 1 insertions, 10 deletions
diff --git a/include/media/davinci/vpbe_osd.h b/include/media/davinci/vpbe_osd.h
index 32f77bcae6b3..e1b1c76aa50f 100644
--- a/include/media/davinci/vpbe_osd.h
+++ b/include/media/davinci/vpbe_osd.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
/*
* Copyright (C) 2007-2009 Texas Instruments Inc
* Copyright (C) 2007 MontaVista Software, Inc.
@@ -6,16 +7,6 @@
* - Initial version
* Murali Karicheri (mkaricheri@gmail.com), Texas Instruments Ltd.
* - ported to sub device interface
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation version 2..
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
*/
#ifndef _OSD_H
#define _OSD_H