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 /drivers/media/rc/keymaps/rc-norwood.c | |
| 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 'drivers/media/rc/keymaps/rc-norwood.c')
| -rw-r--r-- | drivers/media/rc/keymaps/rc-norwood.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/rc/keymaps/rc-norwood.c b/drivers/media/rc/keymaps/rc-norwood.c index f1c1281fbc17..f9f2fa2819b8 100644 --- a/drivers/media/rc/keymaps/rc-norwood.c +++ b/drivers/media/rc/keymaps/rc-norwood.c | |||
| @@ -49,7 +49,7 @@ static struct rc_map_table norwood[] = { | |||
| 49 | { 0x37, KEY_PLAY }, /* Play */ | 49 | { 0x37, KEY_PLAY }, /* Play */ |
| 50 | { 0x36, KEY_PAUSE }, /* Pause */ | 50 | { 0x36, KEY_PAUSE }, /* Pause */ |
| 51 | { 0x2b, KEY_STOP }, /* Stop */ | 51 | { 0x2b, KEY_STOP }, /* Stop */ |
| 52 | { 0x67, KEY_FASTFORWARD }, /* Foward */ | 52 | { 0x67, KEY_FASTFORWARD }, /* Forward */ |
| 53 | { 0x66, KEY_REWIND }, /* Rewind */ | 53 | { 0x66, KEY_REWIND }, /* Rewind */ |
| 54 | { 0x3e, KEY_SEARCH }, /* Auto Scan */ | 54 | { 0x3e, KEY_SEARCH }, /* Auto Scan */ |
| 55 | { 0x2e, KEY_CAMERA }, /* Capture Video */ | 55 | { 0x2e, KEY_CAMERA }, /* Capture Video */ |