[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>

diff --git a/drivers/media/dvb/dvb-usb-v2/Kconfig b/drivers/media/dvb/dvb-usb-v2/Kconfig
index bef2ffa..81f0f1c 100644 (file)
--- 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 6080ec8..a98319c 100644 (file)
--- 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
similarity index 97%
rename from drivers/media/dvb/dvb-usb-v2/dvb_usb_firmware.c
rename to drivers/media/dvb/dvb-usb-v2/cypress_firmware.c
index 61c3fe9..9f7c970 100644 (file)
--- 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
similarity index 85%
rename from drivers/media/dvb/dvb-usb-v2/dvb_usb_firmware.h
rename to drivers/media/dvb/dvb-usb-v2/cypress_firmware.h
index 358d9d0..80085fd 100644 (file)
--- 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