diff options
author | Antti Palosaari <crope@iki.fi> | 2011-07-28 18:17:59 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2011-08-27 10:14:43 -0400 |
commit | f68baeff4530593777295f9b94600b4960eddecd (patch) | |
tree | 3a1e1d603204f063de92398253b2ba68d3f0472f | |
parent | 4c0cfa24f7e0e4b7d48075fcfe867035a4a2ccdf (diff) |
[media] af9015: use logic or instead of sum numbers
Style issue.
Signed-off-by: Antti Palosaari <crope@iki.fi>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r-- | drivers/media/dvb/dvb-usb/af9015.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/drivers/media/dvb/dvb-usb/af9015.c b/drivers/media/dvb/dvb-usb/af9015.c index d70bbe787075..b816600d641c 100644 --- a/drivers/media/dvb/dvb-usb/af9015.c +++ b/drivers/media/dvb/dvb-usb/af9015.c | |||
@@ -744,31 +744,31 @@ static const struct af9015_rc_setup af9015_rc_setup_hashes[] = { | |||
744 | }; | 744 | }; |
745 | 745 | ||
746 | static const struct af9015_rc_setup af9015_rc_setup_usbids[] = { | 746 | static const struct af9015_rc_setup af9015_rc_setup_usbids[] = { |
747 | { (USB_VID_TERRATEC << 16) + USB_PID_TERRATEC_CINERGY_T_STICK_RC, | 747 | { (USB_VID_TERRATEC << 16) | USB_PID_TERRATEC_CINERGY_T_STICK_RC, |
748 | RC_MAP_TERRATEC_SLIM_2 }, | 748 | RC_MAP_TERRATEC_SLIM_2 }, |
749 | { (USB_VID_TERRATEC << 16) + USB_PID_TERRATEC_CINERGY_T_STICK_DUAL_RC, | 749 | { (USB_VID_TERRATEC << 16) | USB_PID_TERRATEC_CINERGY_T_STICK_DUAL_RC, |
750 | RC_MAP_TERRATEC_SLIM }, | 750 | RC_MAP_TERRATEC_SLIM }, |
751 | { (USB_VID_VISIONPLUS << 16) + USB_PID_AZUREWAVE_AD_TU700, | 751 | { (USB_VID_VISIONPLUS << 16) | USB_PID_AZUREWAVE_AD_TU700, |
752 | RC_MAP_AZUREWAVE_AD_TU700 }, | 752 | RC_MAP_AZUREWAVE_AD_TU700 }, |
753 | { (USB_VID_VISIONPLUS << 16) + USB_PID_TINYTWIN, | 753 | { (USB_VID_VISIONPLUS << 16) | USB_PID_TINYTWIN, |
754 | RC_MAP_AZUREWAVE_AD_TU700 }, | 754 | RC_MAP_AZUREWAVE_AD_TU700 }, |
755 | { (USB_VID_MSI_2 << 16) + USB_PID_MSI_DIGI_VOX_MINI_III, | 755 | { (USB_VID_MSI_2 << 16) | USB_PID_MSI_DIGI_VOX_MINI_III, |
756 | RC_MAP_MSI_DIGIVOX_III }, | 756 | RC_MAP_MSI_DIGIVOX_III }, |
757 | { (USB_VID_MSI_2 << 16) + USB_PID_MSI_DIGIVOX_DUO, | 757 | { (USB_VID_MSI_2 << 16) | USB_PID_MSI_DIGIVOX_DUO, |
758 | RC_MAP_MSI_DIGIVOX_III }, | 758 | RC_MAP_MSI_DIGIVOX_III }, |
759 | { (USB_VID_LEADTEK << 16) + USB_PID_WINFAST_DTV_DONGLE_GOLD, | 759 | { (USB_VID_LEADTEK << 16) | USB_PID_WINFAST_DTV_DONGLE_GOLD, |
760 | RC_MAP_LEADTEK_Y04G0051 }, | 760 | RC_MAP_LEADTEK_Y04G0051 }, |
761 | { (USB_VID_LEADTEK << 16) + USB_PID_WINFAST_DTV2000DS, | 761 | { (USB_VID_LEADTEK << 16) | USB_PID_WINFAST_DTV2000DS, |
762 | RC_MAP_LEADTEK_Y04G0051 }, | 762 | RC_MAP_LEADTEK_Y04G0051 }, |
763 | { (USB_VID_AVERMEDIA << 16) + USB_PID_AVERMEDIA_VOLAR_X, | 763 | { (USB_VID_AVERMEDIA << 16) | USB_PID_AVERMEDIA_VOLAR_X, |
764 | RC_MAP_AVERMEDIA_M135A }, | 764 | RC_MAP_AVERMEDIA_M135A }, |
765 | { (USB_VID_AFATECH << 16) + USB_PID_TREKSTOR_DVBT, | 765 | { (USB_VID_AFATECH << 16) | USB_PID_TREKSTOR_DVBT, |
766 | RC_MAP_TREKSTOR }, | 766 | RC_MAP_TREKSTOR }, |
767 | { (USB_VID_KWORLD_2 << 16) + USB_PID_TINYTWIN_2, | 767 | { (USB_VID_KWORLD_2 << 16) | USB_PID_TINYTWIN_2, |
768 | RC_MAP_DIGITALNOW_TINYTWIN }, | 768 | RC_MAP_DIGITALNOW_TINYTWIN }, |
769 | { (USB_VID_GTEK << 16) + USB_PID_TINYTWIN_3, | 769 | { (USB_VID_GTEK << 16) | USB_PID_TINYTWIN_3, |
770 | RC_MAP_DIGITALNOW_TINYTWIN }, | 770 | RC_MAP_DIGITALNOW_TINYTWIN }, |
771 | { (USB_VID_KWORLD_2 << 16) + USB_PID_SVEON_STV22, | 771 | { (USB_VID_KWORLD_2 << 16) | USB_PID_SVEON_STV22, |
772 | RC_MAP_MSI_DIGIVOX_III }, | 772 | RC_MAP_MSI_DIGIVOX_III }, |
773 | { } | 773 | { } |
774 | }; | 774 | }; |