diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-04-07 14:14:49 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-04-07 14:14:49 -0400 |
| commit | 42933bac11e811f02200c944d8562a15f8ec4ff0 (patch) | |
| tree | fcdd9afe56eb0e746565ddd1f92f22d36678b843 /Documentation/input/rotary-encoder.txt | |
| parent | 2b9accbee563f535046ff2cd382d0acaa92e130c (diff) | |
| parent | 25985edcedea6396277003854657b5f3cb31a628 (diff) | |
Merge branch 'for-linus2' of git://git.profusion.mobi/users/lucas/linux-2.6
* 'for-linus2' of git://git.profusion.mobi/users/lucas/linux-2.6:
Fix common misspellings
Diffstat (limited to 'Documentation/input/rotary-encoder.txt')
| -rw-r--r-- | Documentation/input/rotary-encoder.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/input/rotary-encoder.txt b/Documentation/input/rotary-encoder.txt index 8b4129de1d2d..943e8f6f2b15 100644 --- a/Documentation/input/rotary-encoder.txt +++ b/Documentation/input/rotary-encoder.txt | |||
| @@ -46,7 +46,7 @@ c) Falling edge on channel A, channel B in high state | |||
| 46 | 46 | ||
| 47 | d) Falling edge on channel B, channel A in low state | 47 | d) Falling edge on channel B, channel A in low state |
| 48 | Parking position. If the encoder enters this state, a full transition | 48 | Parking position. If the encoder enters this state, a full transition |
| 49 | should have happend, unless it flipped back on half the way. The | 49 | should have happened, unless it flipped back on half the way. The |
| 50 | 'armed' state tells us about that. | 50 | 'armed' state tells us about that. |
| 51 | 51 | ||
| 52 | 2. Platform requirements | 52 | 2. Platform requirements |