Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 355b4b2b authored Aug 01, 2012 by Antti Palosaari Committed by Mauro Carvalho Chehab Aug 04, 2012

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

parent eb29fbea

drivers/media/dvb/dvb-usb-v2/Kconfig

+10 −2

Original line number	Original line	Diff line number	Diff line
	@@ -13,9 +13,17 @@ config DVB_USB_V2

	Say Y if you own a USB DVB device.		Say Y if you own a USB DVB device.

	config DVB_USB_FIRMWARE		config DVB_USB_CYPRESS_FIRMWARE
	tristate "Firmware helper routines"		tristate "Cypress firmware helper routines"
	depends on DVB_USB_V2		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		config DVB_USB_AF9015
	tristate "Afatech AF9015 DVB-T USB2.0 support"		tristate "Afatech AF9015 DVB-T USB2.0 support"

drivers/media/dvb/dvb-usb-v2/Makefile

+1 −1

Original line number	Original line	Diff line number	Diff line
	dvb_usbv2-objs = dvb_usb_core.o dvb_usb_urb.o usb_urb.o		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_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		dvb-usb-af9015-objs = af9015.o
	obj-$(CONFIG_DVB_USB_AF9015) += dvb-usb-af9015.o		obj-$(CONFIG_DVB_USB_AF9015) += dvb-usb-af9015.o

drivers/media/dvb/dvb-usb-v2/dvb_usb_firmware.c→drivers/media/dvb/dvb-usb-v2/cypress_firmware.c

+2 −2

Original line number	Original line	Diff line number	Diff line
	/* 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)		* Copyright (C) 2004-6 Patrick Boettcher (patrick.boettcher@desy.de)
	* see dvb-usb-init.c for copyright information.		* see dvb-usb-init.c for copyright information.
	@@ -9,7 +9,7 @@
	*/		*/

	#include "dvb_usb.h"		#include "dvb_usb.h"
	#include "dvb_usb_firmware.h"		#include "cypress_firmware.h"

	struct usb_cypress_controller {		struct usb_cypress_controller {
	u8 id;		u8 id;

drivers/media/dvb/dvb-usb-v2/dvb_usb_firmware.h→drivers/media/dvb/dvb-usb-v2/cypress_firmware.h

+3 −3

Original line number	Original line	Diff line number	Diff line
	/* 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)		* Copyright (C) 2004-6 Patrick Boettcher (patrick.boettcher@desy.de)
	* see dvb-usb-init.c for copyright information.		* see dvb-usb-init.c for copyright information.
	@@ -8,8 +8,8 @@
	*		*
	*/		*/

	#ifndef DVB_USB_FIRMWARE_H		#ifndef CYPRESS_FIRMWARE_H
	#define DVB_USB_FIRMWARE_H		#define CYPRESS_FIRMWARE_H

	#define CYPRESS_AN2135 0		#define CYPRESS_AN2135 0
	#define CYPRESS_AN2235 1		#define CYPRESS_AN2235 1