Merge branches 'pm-core', 'pm-qos', 'pm-domains' and 'pm-opp'

[linux.git] / Documentation / hwmon / sysfs-interface

diff --git a/Documentation/hwmon/sysfs-interface b/Documentation/hwmon/sysfs-interface
index 2cc95ad466047b055d45f748619cf2d7231d5e93..fc337c317c67353a80afc3a88997e2ead759c340 100644 (file)
--- a/Documentation/hwmon/sysfs-interface
+++ b/Documentation/hwmon/sysfs-interface
@@ -86,8 +86,9 @@ given driver if the chip has the feature.
 
 name           The chip name.
                This should be a short, lowercase string, not containing
-               spaces nor dashes, representing the chip name. This is
-               the only mandatory attribute.
+               whitespace, dashes, or the wildcard character '*'.
+               This attribute represents the chip name. It is the only
+               mandatory attribute.
                I2C devices get this attribute created automatically.
                RO