From 78061c6ad4395a8312d3754cd221cee86b0c7070 Mon Sep 17 00:00:00 2001
From: Michael Krufky <mkrufky@linuxtv.org>
Date: Tue, 16 Sep 2008 02:15:30 -0300
Subject: [PATCH] --- yaml --- r: 113938 b: refs/heads/master c:
 ef80bfeb30f82fb718731a3323a75ae08396a4ea h: refs/heads/master v: v3

---
 [refs]                                          | 2 +-
 trunk/drivers/media/dvb/dvb-usb/cxusb.c         | 2 +-
 trunk/drivers/media/video/cx23885/cx23885-dvb.c | 8 ++++----
 trunk/drivers/media/video/cx88/cx88-dvb.c       | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 4caa08c860c9..790a2ebd90a4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: de3e3b82a6d15264798d4e36f42abaa69f53ca06
+refs/heads/master: ef80bfeb30f82fb718731a3323a75ae08396a4ea
diff --git a/trunk/drivers/media/dvb/dvb-usb/cxusb.c b/trunk/drivers/media/dvb/dvb-usb/cxusb.c
index bffb44380389..1a746127cbda 100644
--- a/trunk/drivers/media/dvb/dvb-usb/cxusb.c
+++ b/trunk/drivers/media/dvb/dvb-usb/cxusb.c
@@ -773,7 +773,7 @@ static int cxusb_dvico_xc3028_tuner_attach(struct dvb_usb_adapter *adap)
 		.callback  = dvico_bluebird_xc2028_callback,
 	};
 	static struct xc2028_ctrl ctl = {
-		.fname       = "xc3028-v27.fw",
+		.fname       = XC2028_DEFAULT_FIRMWARE,
 		.max_len     = 64,
 		.demod       = XC3028_FE_ZARLINK456,
 	};
diff --git a/trunk/drivers/media/video/cx23885/cx23885-dvb.c b/trunk/drivers/media/video/cx23885/cx23885-dvb.c
index f462efde72ad..3b54f1391803 100644
--- a/trunk/drivers/media/video/cx23885/cx23885-dvb.c
+++ b/trunk/drivers/media/video/cx23885/cx23885-dvb.c
@@ -407,7 +407,7 @@ static int dvb_register(struct cx23885_tsport *port)
 				.callback  = cx23885_tuner_callback,
 			};
 			static struct xc2028_ctrl ctl = {
-				.fname       = "xc3028-v27.fw",
+				.fname       = XC2028_DEFAULT_FIRMWARE,
 				.max_len     = 64,
 				.scode_table = XC3028_FE_OREN538,
 			};
@@ -447,7 +447,7 @@ static int dvb_register(struct cx23885_tsport *port)
 				.callback  = cx23885_tuner_callback,
 			};
 			static struct xc2028_ctrl ctl = {
-				.fname   = "xc3028L-v36.fw",
+				.fname   = XC3028L_DEFAULT_FIRMWARE,
 				.max_len = 64,
 				.demod   = 5000,
 				.d2633   = 1
@@ -489,7 +489,7 @@ static int dvb_register(struct cx23885_tsport *port)
 				.callback  = cx23885_tuner_callback,
 			};
 			static struct xc2028_ctrl ctl = {
-				.fname       = "xc3028-v27.fw",
+				.fname       = XC2028_DEFAULT_FIRMWARE,
 				.max_len     = 64,
 				.demod       = XC3028_FE_ZARLINK456,
 			};
@@ -516,7 +516,7 @@ static int dvb_register(struct cx23885_tsport *port)
 				.callback  = cx23885_tuner_callback,
 			};
 			static struct xc2028_ctrl ctl = {
-				.fname       = "xc3028-v27.fw",
+				.fname       = XC2028_DEFAULT_FIRMWARE,
 				.max_len     = 64,
 				.demod       = XC3028_FE_ZARLINK456,
 			};
diff --git a/trunk/drivers/media/video/cx88/cx88-dvb.c b/trunk/drivers/media/video/cx88/cx88-dvb.c
index 07270b77ed8a..9f0e5b3c515e 100644
--- a/trunk/drivers/media/video/cx88/cx88-dvb.c
+++ b/trunk/drivers/media/video/cx88/cx88-dvb.c
@@ -831,7 +831,7 @@ static int dvb_register(struct cx8802_dev *dev)
 				.callback  = cx88_pci_nano_callback,
 			};
 			static struct xc2028_ctrl ctl = {
-				.fname       = "xc3028-v27.fw",
+				.fname       = XC2028_DEFAULT_FIRMWARE,
 				.max_len     = 64,
 				.scode_table = XC3028_FE_OREN538,
 			};