diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-06-23 09:21:15 +0200 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-06-23 09:21:15 +0200 |
commit | 58ee01007c9e00531c1280b2d99b49d29a5e9844 (patch) | |
tree | d1feb7102591a811b4458e2e209d476580ae3687 /include/dt-bindings/i2c/i2c.h | |
parent | usb: clean up some of the computations in adu_read (diff) | |
parent | Linux 5.2-rc6 (diff) | |
download | linux-58ee01007c9e00531c1280b2d99b49d29a5e9844.tar.xz linux-58ee01007c9e00531c1280b2d99b49d29a5e9844.zip |
Merge 5.2-rc6 into usb-next
We need the USB fixes in here too.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include/dt-bindings/i2c/i2c.h')
-rw-r--r-- | include/dt-bindings/i2c/i2c.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/dt-bindings/i2c/i2c.h b/include/dt-bindings/i2c/i2c.h index 1d5da81d90f1..0c12c38dfa2e 100644 --- a/include/dt-bindings/i2c/i2c.h +++ b/include/dt-bindings/i2c/i2c.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ /* * This header provides constants for I2C bindings * @@ -5,8 +6,6 @@ * Copyright (C) 2015 by Renesas Electronics Corporation * * Wolfram Sang <wsa@sang-engineering.com> - * - * GPLv2 only */ #ifndef _DT_BINDINGS_I2C_I2C_H |