diff --git a/[refs] b/[refs] index 526b7b841d63..eeb1977a80f9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 731f902edaf3ed16f8ed9e92d79e3d0d17af608f +refs/heads/master: dbcb86ed945e42e99884e7afaab2f326a2aff2ec diff --git a/trunk/drivers/media/dvb/dvb-usb/cxusb.c b/trunk/drivers/media/dvb/dvb-usb/cxusb.c index f2b9b4be2802..7edd6362b9cc 100644 --- a/trunk/drivers/media/dvb/dvb-usb/cxusb.c +++ b/trunk/drivers/media/dvb/dvb-usb/cxusb.c @@ -246,11 +246,7 @@ static struct dvb_usb_rc_key dvico_portable_rc_keys[] = { { 0xfc, 0x09, KEY_VOLUMEDOWN }, { 0xfc, 0x54, KEY_CHANNELUP }, { 0xfc, 0x0b, KEY_CHANNELDOWN }, - /* - { 0xfc, 0x56, KEY_CAMERA }, - Camera and Record keys both send the same code, - but the camera key doesn't repeat. - */ + { 0xfc, 0x16, KEY_CAMERA }, { 0xfc, 0x40, KEY_TUNER }, /* ATV/DTV */ { 0xfc, 0x45, KEY_OPEN }, { 0xfc, 0x19, KEY_1 },