diff options
| author | Jani Nikula <jani.nikula@intel.com> | 2018-05-02 12:20:32 +0300 |
|---|---|---|
| committer | Jani Nikula <jani.nikula@intel.com> | 2018-05-02 12:20:32 +0300 |
| commit | 53f071e19d566e7d0a4eada1bd8313a4cdb660a4 (patch) | |
| tree | ee2aecae90ec29ab404cf60bedeb3feb2ec99966 /include/media/i2c/adv7511.h | |
| parent | 043477b088d2af61a0937754c6560002237e6741 (diff) | |
| parent | 0ab390262c4920f26f8202063a268d5fc829728e (diff) | |
Merge drm/drm-next into drm-intel-next-queued
Need d224985a5e31 ("sched/wait, drivers/drm: Convert wait_on_atomic_t()
usage to the new wait_var_event() API") in dinq to be able to fix
https://bugs.freedesktop.org/show_bug.cgi?id=106085.
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Diffstat (limited to 'include/media/i2c/adv7511.h')
| -rw-r--r-- | include/media/i2c/adv7511.h | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/include/media/i2c/adv7511.h b/include/media/i2c/adv7511.h index 61c3d711cc69..1874c05f486f 100644 --- a/include/media/i2c/adv7511.h +++ b/include/media/i2c/adv7511.h @@ -1,20 +1,8 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ /* * Analog Devices ADV7511 HDMI Transmitter Device Driver * * Copyright 2013 Cisco Systems, Inc. and/or its affiliates. All rights reserved. - * - * This program is free software; you may redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 2 of the License. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS - * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN - * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. */ #ifndef ADV7511_H |