aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation/input/rotary-encoder.txt
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2011-05-02 10:41:40 +0200
committerTakashi Iwai <tiwai@suse.de>2011-05-02 10:41:40 +0200
commita3ea8e8f2474c35b4c3e22262991afddb93c4c0e (patch)
tree648bbeea304950d02e71863673be8154a5e491f6 /Documentation/input/rotary-encoder.txt
parentc2de187e5b0f25b572ac1cb6cdf383f16123717d (diff)
parentebb47241ea0eac6a5a23404821a2d62f64c68496 (diff)
downloadkernel_replicant_linux-a3ea8e8f2474c35b4c3e22262991afddb93c4c0e.tar.gz
kernel_replicant_linux-a3ea8e8f2474c35b4c3e22262991afddb93c4c0e.tar.bz2
kernel_replicant_linux-a3ea8e8f2474c35b4c3e22262991afddb93c4c0e.zip
Merge branch 'fix/hda' into topic/hda
Diffstat (limited to 'Documentation/input/rotary-encoder.txt')
-rw-r--r--Documentation/input/rotary-encoder.txt2
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
d) Falling edge on channel B, channel A in low state
Parking position. If the encoder enters this state, a full transition
- should have happend, unless it flipped back on half the way. The
+ should have happened, unless it flipped back on half the way. The
'armed' state tells us about that.
2. Platform requirements