diff options
| author | Stefan Agner <stefan.agner@toradex.com> | 2015-08-12 11:20:23 +0200 |
|---|---|---|
| committer | Stefan Agner <stefan.agner@toradex.com> | 2015-08-12 11:20:23 +0200 |
| commit | c4894905dd155afc32fe87a4701a4bf6099953a7 (patch) | |
| tree | a37889ff1b5a01a8f37d183c053ba16c1707fa15 /Documentation | |
| parent | dc92514c086119369c8c07b5b17c5312e0711d75 (diff) | |
| parent | 352cb8677f83a6cf2139151578c8c79785d2d4bf (diff) | |
Merge tag 'v4.1.5' into toradex_vf_4.1-next
This is the 4.1.5 stable release
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/hwmon/nct7904 | 4 | ||||
| -rw-r--r-- | Documentation/kbuild/makefiles.txt | 8 |
2 files changed, 10 insertions, 2 deletions
diff --git a/Documentation/hwmon/nct7904 b/Documentation/hwmon/nct7904 index 014f112e2a14..57fffe33ebfc 100644 --- a/Documentation/hwmon/nct7904 +++ b/Documentation/hwmon/nct7904 @@ -35,11 +35,11 @@ temp1_input Local temperature (1/1000 degree, temp[2-9]_input CPU temperatures (1/1000 degree, 0.125 degree resolution) -fan[1-4]_mode R/W, 0/1 for manual or SmartFan mode +pwm[1-4]_enable R/W, 1/2 for manual or SmartFan mode Setting SmartFan mode is supported only if it has been previously configured by BIOS (or configuration EEPROM) -fan[1-4]_pwm R/O in SmartFan mode, R/W in manual control mode +pwm[1-4] R/O in SmartFan mode, R/W in manual control mode The driver checks sensor control registers and does not export the sensors that are not enabled. Anyway, a sensor that is enabled may actually be not diff --git a/Documentation/kbuild/makefiles.txt b/Documentation/kbuild/makefiles.txt index 74b6c6d97210..d2b1c40cb666 100644 --- a/Documentation/kbuild/makefiles.txt +++ b/Documentation/kbuild/makefiles.txt @@ -952,6 +952,14 @@ When kbuild executes, the following steps are followed (roughly): $(KBUILD_ARFLAGS) set by the top level Makefile to "D" (deterministic mode) if this option is supported by $(AR). + ARCH_CPPFLAGS, ARCH_AFLAGS, ARCH_CFLAGS Overrides the kbuild defaults + + These variables are appended to the KBUILD_CPPFLAGS, + KBUILD_AFLAGS, and KBUILD_CFLAGS, respectively, after the + top-level Makefile has set any other flags. This provides a + means for an architecture to override the defaults. + + --- 6.2 Add prerequisites to archheaders: The archheaders: rule is used to generate header files that |