aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2018-09-20 00:12:01 -0400
committerDave Airlie <airlied@redhat.com>2018-09-20 00:12:07 -0400
commit0320ac5188eab5c6e8b92b110d1eae967ac272d2 (patch)
treefe34d889a20a1a87b2fa47647600b2100526c0aa /include
parent795241040a9102b7dc925714f6a57ec92d84932e (diff)
parent6e1637c91742570ff873433ed27227933b792af4 (diff)
Merge tag 'du-next-20180914' of git://linuxtv.org/pinchartl/media into drm-next
R-Car DU changes for v4.20 The pull request mostly contains updates to the R-Car DU driver, notably support for interlaced modes on Gen3 hardware, support for the LVDS output on R8A77980, and a set of miscellaneous bug fixes. There are also two SPDX conversion patches for the drm shmobile and panel-lvds drivers, as well as an update to MAINTAINERS to add Kieran Bingham as a co-maintainer for the DU driver. Signed-off-by: Dave Airlie <airlied@redhat.com> From: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Link: https://patchwork.freedesktop.org/patch/msgid/3273568.LdoAI77IYW@avalon
Diffstat (limited to 'include')
-rw-r--r--include/linux/platform_data/shmob_drm.h6
1 files changed, 1 insertions, 5 deletions
diff --git a/include/linux/platform_data/shmob_drm.h b/include/linux/platform_data/shmob_drm.h
index ee495d707f17..fe815d7d9f58 100644
--- a/include/linux/platform_data/shmob_drm.h
+++ b/include/linux/platform_data/shmob_drm.h
@@ -1,14 +1,10 @@
1/* SPDX-License-Identifier: GPL-2.0+ */
1/* 2/*
2 * shmob_drm.h -- SH Mobile DRM driver 3 * shmob_drm.h -- SH Mobile DRM driver
3 * 4 *
4 * Copyright (C) 2012 Renesas Corporation 5 * Copyright (C) 2012 Renesas Corporation
5 * 6 *
6 * Laurent Pinchart (laurent.pinchart@ideasonboard.com) 7 * Laurent Pinchart (laurent.pinchart@ideasonboard.com)
7 *
8 * This program is free software; you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation; either version 2 of the License, or
11 * (at your option) any later version.
12 */ 8 */
13 9
14#ifndef __SHMOB_DRM_H__ 10#ifndef __SHMOB_DRM_H__