[media] rc/keymaps: use KEY_CAMERA for snapshots

On a few places, KEY_MHP were used for snapshots. However, KEY_CAMERA
is used for it on all the other keyboards that have a snapshot/Picture
button.

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Jarod Wilson <jarod@redhat.com>

diff --git a/drivers/media/dvb/dvb-usb/digitv.c b/drivers/media/dvb/dvb-usb/digitv.c
index f2dbce7edb3b5885e47a5c395541a4dfdd881ee7..f6344cdd360f7acd99a2c3c93b022269d9acc6a8 100644 (file)
--- a/drivers/media/dvb/dvb-usb/digitv.c
+++ b/drivers/media/dvb/dvb-usb/digitv.c
@@ -176,7 +176,7 @@ static struct rc_map_table rc_map_digitv_table[] = {
        { 0xaf59, KEY_AUX },
        { 0x5f5a, KEY_DVD },
        { 0x6f5a, KEY_POWER },
-       { 0x9f5a, KEY_MHP },     /* labelled 'Picture' */
+       { 0x9f5a, KEY_CAMERA },     /* labelled 'Picture' */
        { 0xaf5a, KEY_AUDIO },
        { 0x5f65, KEY_INFO },
        { 0x6f65, KEY_F13 },     /* 16:9 */

diff --git a/drivers/media/rc/keymaps/rc-avermedia-m135a.c b/drivers/media/rc/keymaps/rc-avermedia-m135a.c
index 357fea58a46e15e69372d50e3cde05b52dd539d1..3d2cbe4e5e46c1f3739aebd937322cd160938e71 100644 (file)
--- a/drivers/media/rc/keymaps/rc-avermedia-m135a.c
+++ b/drivers/media/rc/keymaps/rc-avermedia-m135a.c
@@ -108,7 +108,7 @@ static struct rc_map_table avermedia_m135a[] = {
        { 0x0414, KEY_TEXT },
        { 0x0415, KEY_EPG },
        { 0x041a, KEY_TV2 },      /* PIP */
-       { 0x041b, KEY_MHP },      /* Snapshot */
+       { 0x041b, KEY_CAMERA },      /* Snapshot */
 
        { 0x0417, KEY_RECORD },
        { 0x0416, KEY_PLAYPAUSE },

diff --git a/drivers/media/rc/keymaps/rc-avermedia-m733a-rm-k6.c b/drivers/media/rc/keymaps/rc-avermedia-m733a-rm-k6.c
index e694e6eac37e1bc38d66c35cc98a6cbbaec9e7a5..8cd7f28808bdad9541c7a4438f5cc5eb1bdd6cde 100644 (file)
--- a/drivers/media/rc/keymaps/rc-avermedia-m733a-rm-k6.c
+++ b/drivers/media/rc/keymaps/rc-avermedia-m733a-rm-k6.c
@@ -56,7 +56,7 @@ static struct rc_map_table avermedia_m733a_rm_k6[] = {
        { 0x0414, KEY_TEXT },
        { 0x0415, KEY_EPG },
        { 0x041a, KEY_TV2 },      /* PIP */
-       { 0x041b, KEY_MHP },      /* Snapshot */
+       { 0x041b, KEY_CAMERA },      /* Snapshot */
 
        { 0x0417, KEY_RECORD },
        { 0x0416, KEY_PLAYPAUSE },

diff --git a/drivers/media/rc/keymaps/rc-budget-ci-old.c b/drivers/media/rc/keymaps/rc-budget-ci-old.c
index 97fc3862f608a3ba4d97ef165f90eca06dbdc327..2f66e4310d20801e09a5baa3a159ba20a5228786 100644 (file)
--- a/drivers/media/rc/keymaps/rc-budget-ci-old.c
+++ b/drivers/media/rc/keymaps/rc-budget-ci-old.c
@@ -12,7 +12,8 @@
 
 #include <media/rc-map.h>
 
-/* From reading the following remotes:
+/*
+ * From reading the following remotes:
  * Zenith Universal 7 / TV Mode 807 / VCR Mode 837
  * Hauppauge (from NOVA-CI-s box product)
  * This is a "middle of the road" approach, differences are noted

diff --git a/drivers/media/rc/keymaps/rc-encore-enltv.c b/drivers/media/rc/keymaps/rc-encore-enltv.c
index afa4e92284ef546e71df080a76428600801477e2..1a0e590b5d216cdeb60c0d603d9d755c7e49b16a 100644 (file)
--- a/drivers/media/rc/keymaps/rc-encore-enltv.c
+++ b/drivers/media/rc/keymaps/rc-encore-enltv.c
@@ -24,7 +24,7 @@ static struct rc_map_table encore_enltv[] = {
        { 0x1e, KEY_TV },
        { 0x00, KEY_VIDEO },
        { 0x01, KEY_AUDIO },            /* music */
-       { 0x02, KEY_MHP },              /* picture */
+       { 0x02, KEY_CAMERA },           /* picture */
 
        { 0x1f, KEY_1 },
        { 0x03, KEY_2 },

diff --git a/drivers/media/rc/keymaps/rc-hauppauge-new.c b/drivers/media/rc/keymaps/rc-hauppauge-new.c
index bd11da46e56a58810b554025fc861bf0a9e09dd2..b6a12feb0127000005e33f6408f94585e688567b 100644 (file)
--- a/drivers/media/rc/keymaps/rc-hauppauge-new.c
+++ b/drivers/media/rc/keymaps/rc-hauppauge-new.c
@@ -48,7 +48,7 @@ static struct rc_map_table hauppauge_new[] = {
           "Multimedia Home Platform" -
           no "PICTURES" key in input.h
         */
-       { 0x1a, KEY_MHP },
+       { 0x1a, KEY_CAMERA },
 
        { 0x1b, KEY_EPG },              /* Guide */
        { 0x1c, KEY_TV },

diff --git a/drivers/media/rc/keymaps/rc-nebula.c b/drivers/media/rc/keymaps/rc-nebula.c
index 3e6f077eb7008308a15b1b96651ac7db2a94c9e4..ddae20e9cd96d11ae78a2c42cb1fad1d12f24cc6 100644 (file)
--- a/drivers/media/rc/keymaps/rc-nebula.c
+++ b/drivers/media/rc/keymaps/rc-nebula.c
@@ -27,7 +27,7 @@ static struct rc_map_table nebula[] = {
        { 0x0b, KEY_AUX },
        { 0x0c, KEY_DVD },
        { 0x0d, KEY_POWER },
-       { 0x0e, KEY_MHP },      /* labelled 'Picture' */
+       { 0x0e, KEY_CAMERA },   /* labelled 'Picture' */
        { 0x0f, KEY_AUDIO },
        { 0x10, KEY_INFO },
        { 0x11, KEY_F13 },      /* 16:9 */

diff --git a/drivers/media/rc/keymaps/rc-rc5-hauppauge-new.c b/drivers/media/rc/keymaps/rc-rc5-hauppauge-new.c
index dfc9b15f43a9e65f04b67686a052dfb18a7a9165..2ca825b4bef26dcf074c828aef090d44acd9e352 100644 (file)
--- a/drivers/media/rc/keymaps/rc-rc5-hauppauge-new.c
+++ b/drivers/media/rc/keymaps/rc-rc5-hauppauge-new.c
@@ -51,7 +51,7 @@ static struct rc_map_table rc5_hauppauge_new[] = {
           "Multimedia Home Platform" -
           no "PICTURES" key in input.h
         */
-       { 0x1e1a, KEY_MHP },
+       { 0x1e1a, KEY_CAMERA },
 
        { 0x1e1b, KEY_EPG },            /* Guide */
        { 0x1e1c, KEY_TV },