summaryrefslogtreecommitdiffstats
path: root/Documentation/hwmon/lm75
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2013-03-26 17:16:14 +0000
committerMark Brown <broonie@opensource.wolfsonmicro.com>2013-03-26 17:16:14 +0000
commit49bc389ec2318b75e86a3c3239a495d7a8311046 (patch)
tree5fe953bd06a535b262ac3da29ab9aa09e5a57d8c /Documentation/hwmon/lm75
parentaed9913e6fad5a7eccce2b7a3ee6daa96b575157 (diff)
parentdf8c3dbee9e6f19ddb0ae8e05cdf76eb2d3b7f00 (diff)
downloadblackbird-op-linux-49bc389ec2318b75e86a3c3239a495d7a8311046.tar.gz
blackbird-op-linux-49bc389ec2318b75e86a3c3239a495d7a8311046.zip
Merge tag 'arizona-extcon-asoc' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/misc into asoc-arizona
ASoC/extcon: arizona: Fix interaction between HPDET and headphone outputs This patch series covers both ASoC and extcon subsystems and fixes an interaction between the HPDET function and the headphone outputs - we really shouldn't run HPDET while the headphone is active. The first patch is a refactoring to make the extcon side easier.
Diffstat (limited to 'Documentation/hwmon/lm75')
-rw-r--r--Documentation/hwmon/lm752
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/hwmon/lm75 b/Documentation/hwmon/lm75
index c91a1d15fa28..69af1c7db6b7 100644
--- a/Documentation/hwmon/lm75
+++ b/Documentation/hwmon/lm75
@@ -23,7 +23,7 @@ Supported chips:
Datasheet: Publicly available at the Maxim website
http://www.maxim-ic.com/
* Microchip (TelCom) TCN75
- Prefix: 'lm75'
+ Prefix: 'tcn75'
Addresses scanned: none
Datasheet: Publicly available at the Microchip website
http://www.microchip.com/
OpenPOWER on IntegriCloud