diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2018-06-12 13:19:38 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-06-12 13:19:38 -0700 |
| commit | 98db5e5503c21c27705c49ebda782b4252b5f7a7 (patch) | |
| tree | b7f3cec0f0fbea2a8187991219e633a14d32eaa5 /include/linux | |
| parent | Merge tag 'ntb-4.18' of git://github.com/jonmason/ntb (diff) | |
| parent | Merge branches 'thermal-core' and 'thermal-intel' into next (diff) | |
| download | linux-dev-98db5e5503c21c27705c49ebda782b4252b5f7a7.tar.xz linux-dev-98db5e5503c21c27705c49ebda782b4252b5f7a7.zip | |
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux
Pull thermal updates from Zhang Rui:
"Thermal core and intel thermal drivers:
- convert thermal sysfs attributes to use DEVICE_ATTR_{RO|RW|WO}()
variants (Viresh Kumar)
- update license to SPDX format (Lina Iyer)
- add GeminiLake support for int340x processor_thermal driver (Sumeet
Pawnikar)
- prevent error in reading trip hysteresis attribute for int340x
thermal driver (Srinivas Pandruvada)"
* 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux:
thermal: int340x: processor_thermal: Add GeminiLake support
drivers: thermal: Update license to SPDX format
thermal: int340x: Prevent error in reading trip hysteresis attribute
thermal: Use DEVICE_ATTR_{RO|RW|WO}() variants
thermal: Shorten name of sysfs callbacks
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/thermal.h | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/include/linux/thermal.h b/include/linux/thermal.h index 7834be668d80..5f4705f46c2f 100644 --- a/include/linux/thermal.h +++ b/include/linux/thermal.h @@ -1,25 +1,10 @@ +/* SPDX-License-Identifier: GPL-2.0 */ /* * thermal.h ($Revision: 0 $) * * Copyright (C) 2008 Intel Corp * Copyright (C) 2008 Zhang Rui <rui.zhang@intel.com> * Copyright (C) 2008 Sujith Thomas <sujith.thomas@intel.com> - * - * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 2 of the License. - * - * 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. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. - * - * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ #ifndef __THERMAL_H__ |