diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2010-03-08 10:55:37 -0500 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2010-03-08 10:55:37 -0500 |
| commit | 318ae2edc3b29216abd8a2510f3f80b764f06858 (patch) | |
| tree | ce595adde342f57f379d277b25e4dd206988a052 /Documentation/input/rotary-encoder.txt | |
| parent | 25cf84cf377c0aae5dbcf937ea89bc7893db5176 (diff) | |
| parent | 3e58974027b04e84f68b964ef368a6cd758e2f84 (diff) | |
Merge branch 'for-next' into for-linus
Conflicts:
Documentation/filesystems/proc.txt
arch/arm/mach-u300/include/mach/debug-macro.S
drivers/net/qlge/qlge_ethtool.c
drivers/net/qlge/qlge_main.c
drivers/net/typhoon.c
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 3a6aec40c0b0..8b4129de1d2d 100644 --- a/Documentation/input/rotary-encoder.txt +++ b/Documentation/input/rotary-encoder.txt | |||
| @@ -75,7 +75,7 @@ and the number of steps or will clamp at the maximum and zero depending on | |||
| 75 | the configuration. | 75 | the configuration. |
| 76 | 76 | ||
| 77 | Because GPIO to IRQ mapping is platform specific, this information must | 77 | Because GPIO to IRQ mapping is platform specific, this information must |
| 78 | be given in seperately to the driver. See the example below. | 78 | be given in separately to the driver. See the example below. |
| 79 | 79 | ||
| 80 | ---------<snip>--------- | 80 | ---------<snip>--------- |
| 81 | 81 | ||