summaryrefslogtreecommitdiff
path: root/drivers/media/dvb
diff options
context:
space:
mode:
authorAntti Palosaari <crope@iki.fi>2012-08-02 04:38:46 +0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2012-08-04 14:56:40 +0400
commit355b4b2b5e83986132c77326e2b97780480b8d69 (patch)
treedc03ce4945a26696ab051e187adae419020ed5f1 /drivers/media/dvb
parenteb29fbeaed617f7a2cf53d276535f8fbdc28db09 (diff)
downloadlinux-355b4b2b5e83986132c77326e2b97780480b8d69.tar.xz
[media] dvb_usbv2: rename dvb_usb_firmware to cypress_firmware
Signed-off-by: Antti Palosaari <crope@iki.fi> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/dvb')
-rw-r--r--drivers/media/dvb/dvb-usb-v2/Kconfig12
-rw-r--r--drivers/media/dvb/dvb-usb-v2/Makefile2
-rw-r--r--drivers/media/dvb/dvb-usb-v2/cypress_firmware.c (renamed from drivers/media/dvb/dvb-usb-v2/dvb_usb_firmware.c)4
-rw-r--r--drivers/media/dvb/dvb-usb-v2/cypress_firmware.h (renamed from drivers/media/dvb/dvb-usb-v2/dvb_usb_firmware.h)6
4 files changed, 16 insertions, 8 deletions
diff --git a/drivers/media/dvb/dvb-usb-v2/Kconfig b/drivers/media/dvb/dvb-usb-v2/Kconfig
index bef2ffa18130..81f0f1c03c1c 100644
--- a/drivers/media/dvb/dvb-usb-v2/Kconfig
+++ b/drivers/media/dvb/dvb-usb-v2/Kconfig
@@ -13,9 +13,17 @@ config DVB_USB_V2
Say Y if you own a USB DVB device.
-config DVB_USB_FIRMWARE
- tristate "Firmware helper routines"
+config DVB_USB_CYPRESS_FIRMWARE
+ tristate "Cypress firmware helper routines"
depends on DVB_USB_V2
+ help
+ Common firmware download routine for various Cypress USB interface
+ chips.
+
+ Supported models are:
+ Cypress AN2135
+ Cypress AN2235
+ Cypress FX2
config DVB_USB_AF9015
tristate "Afatech AF9015 DVB-T USB2.0 support"
diff --git a/drivers/media/dvb/dvb-usb-v2/Makefile b/drivers/media/dvb/dvb-usb-v2/Makefile
index 6080ec89577f..a98319cd216e 100644
--- a/drivers/media/dvb/dvb-usb-v2/Makefile
+++ b/drivers/media/dvb/dvb-usb-v2/Makefile
@@ -1,7 +1,7 @@
dvb_usbv2-objs = dvb_usb_core.o dvb_usb_urb.o usb_urb.o
obj-$(CONFIG_DVB_USB_V2) += dvb_usbv2.o
-obj-$(CONFIG_DVB_USB_FIRMWARE) += dvb_usb_firmware.o
+obj-$(DVB_USB_CYPRESS_FIRMWARE) += dvb_usb_cypress_firmware.o
dvb-usb-af9015-objs = af9015.o
obj-$(CONFIG_DVB_USB_AF9015) += dvb-usb-af9015.o
diff --git a/drivers/media/dvb/dvb-usb-v2/dvb_usb_firmware.c b/drivers/media/dvb/dvb-usb-v2/cypress_firmware.c
index 61c3fe9a599e..9f7c970c6424 100644
--- a/drivers/media/dvb/dvb-usb-v2/dvb_usb_firmware.c
+++ b/drivers/media/dvb/dvb-usb-v2/cypress_firmware.c
@@ -1,4 +1,4 @@
-/* dvb_usb_firmware.c is part of the DVB USB library.
+/* cypress_firmware.c is part of the DVB USB library.
*
* Copyright (C) 2004-6 Patrick Boettcher (patrick.boettcher@desy.de)
* see dvb-usb-init.c for copyright information.
@@ -9,7 +9,7 @@
*/
#include "dvb_usb.h"
-#include "dvb_usb_firmware.h"
+#include "cypress_firmware.h"
struct usb_cypress_controller {
u8 id;
diff --git a/drivers/media/dvb/dvb-usb-v2/dvb_usb_firmware.h b/drivers/media/dvb/dvb-usb-v2/cypress_firmware.h
index 358d9d0b1899..80085fd4132c 100644
--- a/drivers/media/dvb/dvb-usb-v2/dvb_usb_firmware.h
+++ b/drivers/media/dvb/dvb-usb-v2/cypress_firmware.h
@@ -1,4 +1,4 @@
-/* dvb_usb_firmware.c is part of the DVB USB library.
+/* cypress_firmware.h is part of the DVB USB library.
*
* Copyright (C) 2004-6 Patrick Boettcher (patrick.boettcher@desy.de)
* see dvb-usb-init.c for copyright information.
@@ -8,8 +8,8 @@
*
*/
-#ifndef DVB_USB_FIRMWARE_H
-#define DVB_USB_FIRMWARE_H
+#ifndef CYPRESS_FIRMWARE_H
+#define CYPRESS_FIRMWARE_H
#define CYPRESS_AN2135 0
#define CYPRESS_AN2235 1