diff options
author | Jiri Kosina <jkosina@suse.cz> | 2012-06-29 08:45:58 -0400 |
---|---|---|
committer | Jiri Kosina <jkosina@suse.cz> | 2012-06-29 08:45:58 -0400 |
commit | 59f91e5dd0504dc0ebfaa0b6f3a55e6931f96266 (patch) | |
tree | b913718405d44a921905ac71044fbde410256865 /Documentation/ABI/testing/sysfs-bus-i2c-devices-lm3533 | |
parent | 57bdfdd80077addf518a9b90c4a66890efc4f70e (diff) | |
parent | 89abfab133ef1f5902abafb744df72793213ac19 (diff) |
Merge branch 'master' into for-next
Conflicts:
include/linux/mmzone.h
Synced with Linus' tree so that trivial patch can be applied
on top of up-to-date code properly.
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Diffstat (limited to 'Documentation/ABI/testing/sysfs-bus-i2c-devices-lm3533')
-rw-r--r-- | Documentation/ABI/testing/sysfs-bus-i2c-devices-lm3533 | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/Documentation/ABI/testing/sysfs-bus-i2c-devices-lm3533 b/Documentation/ABI/testing/sysfs-bus-i2c-devices-lm3533 new file mode 100644 index 000000000000..1b62230b33b9 --- /dev/null +++ b/Documentation/ABI/testing/sysfs-bus-i2c-devices-lm3533 | |||
@@ -0,0 +1,15 @@ | |||
1 | What: /sys/bus/i2c/devices/.../output_hvled[n] | ||
2 | Date: April 2012 | ||
3 | KernelVersion: 3.5 | ||
4 | Contact: Johan Hovold <jhovold@gmail.com> | ||
5 | Description: | ||
6 | Set the controlling backlight device for high-voltage current | ||
7 | sink HVLED[n] (n = 1, 2) (0, 1). | ||
8 | |||
9 | What: /sys/bus/i2c/devices/.../output_lvled[n] | ||
10 | Date: April 2012 | ||
11 | KernelVersion: 3.5 | ||
12 | Contact: Johan Hovold <jhovold@gmail.com> | ||
13 | Description: | ||
14 | Set the controlling led device for low-voltage current sink | ||
15 | LVLED[n] (n = 1..5) (0..3). | ||