summaryrefslogtreecommitdiff
path: root/include/media/i2c/upd64031a.h
diff options
context:
space:
mode:
authorRodrigo Vivi <rodrigo.vivi@intel.com>2019-07-10 16:51:35 +0300
committerRodrigo Vivi <rodrigo.vivi@intel.com>2019-07-10 16:51:35 +0300
commit88c90e800675b98008d5ebe5e81245910417a22d (patch)
treeeb06c935cc3363a284382fce1f6721f3a862654e /include/media/i2c/upd64031a.h
parentcaceff96d5b7b487da19c0916e0048ff8f1709a9 (diff)
parent4cf643a39221af24a151ad2cff4e3f95f12f368e (diff)
downloadlinux-88c90e800675b98008d5ebe5e81245910417a22d.tar.xz
Merge drm/drm-next into drm-intel-next-queued
Catch-up with 5.2. Specially to remove a drm-tip merge fixup around intel_workarounds. Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Diffstat (limited to 'include/media/i2c/upd64031a.h')
-rw-r--r--include/media/i2c/upd64031a.h11
1 files changed, 1 insertions, 10 deletions
diff --git a/include/media/i2c/upd64031a.h b/include/media/i2c/upd64031a.h
index 1eba24dfee48..b6570abc84ef 100644
--- a/include/media/i2c/upd64031a.h
+++ b/include/media/i2c/upd64031a.h
@@ -1,17 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
/*
* upd64031a - NEC Electronics Ghost Reduction input defines
*
* 2006 by Hans Verkuil (hverkuil@xs4all.nl)
- *
- * 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; either version 2
- * of the License, or (at your option) any later version.
- *
- * 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 _UPD64031A_H_