---

yaml --- r: 330666 b: refs/heads/master c: 355b4b2 h: refs/heads/master v: v3
git-mirror · Aug 4, 2012 · 02d0be8 · 02d0be8
1 parent 3054979
commit 02d0be8
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 9 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: eb29fbeaed617f7a2cf53d276535f8fbdc28db09
+refs/heads/master: 355b4b2b5e83986132c77326e2b97780480b8d69
diff --git a/trunk/drivers/media/dvb/dvb-usb-v2/Kconfig b/trunk/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/trunk/drivers/media/dvb/dvb-usb-v2/Makefile b/trunk/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/...s/media/dvb/dvb-usb-v2/dvb_usb_firmware.c → ...s/media/dvb/dvb-usb-v2/cypress_firmware.c b/...s/media/dvb/dvb-usb-v2/dvb_usb_firmware.c → ...s/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/...s/media/dvb/dvb-usb-v2/dvb_usb_firmware.h → ...s/media/dvb/dvb-usb-v2/cypress_firmware.h b/...s/media/dvb/dvb-usb-v2/dvb_usb_firmware.h → ...s/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