diff options
| author | Greg Kroah-Hartman | 2019-06-17 11:23:24 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2019-06-17 11:23:24 +0200 |
| commit | a954e5fb4bc2d401b8fc3b4c7cd316497ff80225 (patch) | |
| tree | 06af23b232c7c2e795a2fef8a5a0604ec64d5092 /drivers/iio/pressure/mpl3115.c | |
| parent | Revert "usb: mtu3: fix up undefined reference to usb_debug_root" (diff) | |
| parent | Linux 5.2-rc5 (diff) | |
| download | kernel-qcow2-linux-a954e5fb4bc2d401b8fc3b4c7cd316497ff80225.tar.gz kernel-qcow2-linux-a954e5fb4bc2d401b8fc3b4c7cd316497ff80225.tar.xz kernel-qcow2-linux-a954e5fb4bc2d401b8fc3b4c7cd316497ff80225.zip | |
Merge 5.2-rc5 into usb-next
We need the USB fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/iio/pressure/mpl3115.c')
| -rw-r--r-- | drivers/iio/pressure/mpl3115.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/iio/pressure/mpl3115.c b/drivers/iio/pressure/mpl3115.c index 7537547fb7ee..d066f3c5a8a6 100644 --- a/drivers/iio/pressure/mpl3115.c +++ b/drivers/iio/pressure/mpl3115.c @@ -1,12 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * mpl3115.c - Support for Freescale MPL3115A2 pressure/temperature sensor * * Copyright (c) 2013 Peter Meerwald <pmeerw@pmeerw.net> * - * This file is subject to the terms and conditions of version 2 of - * the GNU General Public License. See the file COPYING in the main - * directory of this archive for more details. - * * (7-bit I2C slave address 0x60) * * TODO: FIFO buffer, altimeter mode, oversampling, continuous mode, |