diff options
| author | Ingo Molnar <mingo@kernel.org> | 2019-06-17 12:29:16 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2019-06-17 12:29:16 +0200 |
| commit | bddb3636737f658886a0a02b64db5366bba3428e (patch) | |
| tree | 8f7ffcb42803fa0bb3378ef969545e4a5e57262c /drivers/iio/pressure/mpl115.c | |
| parent | 3384c78631dd722c2cdc5c57fbdd39fc1b5a9f2d (diff) | |
| parent | cbb99c0f588737ec98c333558922ce47e9a95827 (diff) | |
Merge branch 'x86/cpu' into perf/core, to pick up dependent changes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/iio/pressure/mpl115.c')
| -rw-r--r-- | drivers/iio/pressure/mpl115.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/iio/pressure/mpl115.c b/drivers/iio/pressure/mpl115.c index ab4786d0102b..ca81a3dc5646 100644 --- a/drivers/iio/pressure/mpl115.c +++ b/drivers/iio/pressure/mpl115.c @@ -1,14 +1,10 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * mpl115.c - Support for Freescale MPL115A pressure/temperature sensor * * Copyright (c) 2014 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. - * * TODO: shutdown pin - * */ #include <linux/module.h> |