diff options
author | Mark Brown <broonie@kernel.org> | 2019-06-10 19:52:53 +0200 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2019-06-10 19:52:53 +0200 |
commit | 4343f61103cdb8ccd6f3d5dd7168f1176a1cee37 (patch) | |
tree | 3db0a2e099cf7feb0c2d60d2a4bf1bf10d5253db /include/media/media-entity.h | |
parent | spi: Use struct_size() helper (diff) | |
parent | Linux 5.2-rc4 (diff) | |
download | linux-4343f61103cdb8ccd6f3d5dd7168f1176a1cee37.tar.xz linux-4343f61103cdb8ccd6f3d5dd7168f1176a1cee37.zip |
Merge tag 'v5.2-rc4' into spi-5.3
Linux 5.2-rc4
Diffstat (limited to 'include/media/media-entity.h')
-rw-r--r-- | include/media/media-entity.h | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/include/media/media-entity.h b/include/media/media-entity.h index 3cbad42e3693..8cb2c504a05c 100644 --- a/include/media/media-entity.h +++ b/include/media/media-entity.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ /* * Media entity * @@ -5,15 +6,6 @@ * * Contacts: Laurent Pinchart <laurent.pinchart@ideasonboard.com> * Sakari Ailus <sakari.ailus@iki.fi> - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. - * - * 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 _MEDIA_ENTITY_H |