diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2014-08-07 02:36:12 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2014-08-07 02:36:12 -0400 |
| commit | 5e2aa2ed08e2e280121dc7cf5609c87d464f12ef (patch) | |
| tree | ca7d7b1480285e3b617fecc5b41f0ce150a82c32 /Documentation/w1/w1.generic | |
| parent | f62d14a8072b9756db36ba394e2b267470a40240 (diff) | |
| parent | fc8104bc5a3f6f49d79f45f2706f79f77a9fb2ae (diff) | |
Merge branch 'next' into for-linus
Prepare first round of input updates for 3.17.
Diffstat (limited to 'Documentation/w1/w1.generic')
| -rw-r--r-- | Documentation/w1/w1.generic | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/w1/w1.generic b/Documentation/w1/w1.generic index a31c5a242973..b2033c64c7da 100644 --- a/Documentation/w1/w1.generic +++ b/Documentation/w1/w1.generic | |||
| @@ -82,7 +82,7 @@ driver - (standard) symlink to the w1 driver | |||
| 82 | w1_master_add - Manually register a slave device | 82 | w1_master_add - Manually register a slave device |
| 83 | w1_master_attempts - the number of times a search was attempted | 83 | w1_master_attempts - the number of times a search was attempted |
| 84 | w1_master_max_slave_count | 84 | w1_master_max_slave_count |
| 85 | - the maximum slaves that may be attached to a master | 85 | - maximum number of slaves to search for at a time |
| 86 | w1_master_name - the name of the device (w1_bus_masterX) | 86 | w1_master_name - the name of the device (w1_bus_masterX) |
| 87 | w1_master_pullup - 5V strong pullup 0 enabled, 1 disabled | 87 | w1_master_pullup - 5V strong pullup 0 enabled, 1 disabled |
| 88 | w1_master_remove - Manually remove a slave device | 88 | w1_master_remove - Manually remove a slave device |