From f5f2f7b674aada488695d7f65b8bdc9847e2ee8e Mon Sep 17 00:00:00 2001
From: Michael Krufky <mkrufky@kernellabs.com>
Date: Tue, 7 Feb 2012 01:52:24 -0300
Subject: [PATCH] --- yaml --- r: 294933 b: refs/heads/master c:
 00f92ed6c8b7b755e3c150bb115843f77f33d995 h: refs/heads/master i:   294931:
 691b076e1d0413992de2971c98303a80f634d1f2 v: v3

---
 [refs]                                     | 2 +-
 trunk/drivers/media/common/tuners/xc5000.h | 7 ++-----
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 81bd57b694a3..9f2b570ddd5b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d58a8d67340383aec1d9944a0433bad36a4d7e2d
+refs/heads/master: 00f92ed6c8b7b755e3c150bb115843f77f33d995
diff --git a/trunk/drivers/media/common/tuners/xc5000.h b/trunk/drivers/media/common/tuners/xc5000.h
index 471f3f8ef769..91036757e898 100644
--- a/trunk/drivers/media/common/tuners/xc5000.h
+++ b/trunk/drivers/media/common/tuners/xc5000.h
@@ -35,11 +35,8 @@ struct xc5000_fw_cfg {
 extern struct xc5000_fw_cfg xc5000a_1_6_114;
 extern struct xc5000_fw_cfg xc5000c_41_024_5_31875;
 
-#define XC5000_FW_A_1_6_114            &xc5000a_1_6_114
-#define XC5000_FW_C_41_024_5_31875     &xc5000c_41_024_5_31875
-
-#define XC5000_DEFAULT_FIRMWARE XC5000_FW_A_1_6_114
-#define XC5000C_DEFAULT_FIRMWARE XC5000_FW_C_41_024_5_31875
+#define XC5000_DEFAULT_FIRMWARE  &xc5000a_1_6_114
+#define XC5000C_DEFAULT_FIRMWARE &xc5000c_41_024_5_31875
 
 struct xc5000_config {
 	u8   i2c_address;