The patch number 8948 was added via Michael Krufky <[EMAIL PROTECTED]>
to http://linuxtv.org/hg/v4l-dvb master development tree.
Kernel patches in this development tree may be modified to be backward
compatible with older kernels. Compatibility modifications will be
removed before inclusion into the mainstream Kernel
If anyone has any objections, please let us know by sending a message to:
[EMAIL PROTECTED]
------
From: Michael Krufky <[EMAIL PROTECTED]>
xc5000: kill xc5000_priv.h
move struct xc5000_priv into xc5000.c and delete xc5000_priv.h
Priority: normal
Signed-off-by: Michael Krufky <[EMAIL PROTECTED]>
---
linux/drivers/media/common/tuners/xc5000.c | 13 +++++
linux/drivers/media/common/tuners/xc5000_priv.h | 37 ----------------
2 files changed, 12 insertions(+), 38 deletions(-)
diff -r 085961e0b1cc -r 6ac538c97b72 linux/drivers/media/common/tuners/xc5000.c
--- a/linux/drivers/media/common/tuners/xc5000.c Fri Sep 05 10:20:56
2008 -0300
+++ b/linux/drivers/media/common/tuners/xc5000.c Sat Sep 06 09:52:30
2008 -0400
@@ -30,7 +30,6 @@
#include "dvb_frontend.h"
#include "xc5000.h"
-#include "xc5000_priv.h"
static int debug;
module_param(debug, int, 0644);
@@ -45,6 +44,18 @@ MODULE_PARM_DESC(init_fw, "Load firmware
#define XC5000_DEFAULT_FIRMWARE "dvb-fe-xc5000-1.1.fw"
#define XC5000_DEFAULT_FIRMWARE_SIZE 12332
+
+struct xc5000_priv {
+ struct xc5000_config *cfg;
+ struct i2c_adapter *i2c;
+
+ u32 freq_hz;
+ u32 bandwidth;
+ u8 video_standard;
+ u8 rf_mode;
+
+ void *devptr;
+};
/* Misc Defines */
#define MAX_TV_STANDARD 23
diff -r 085961e0b1cc -r 6ac538c97b72
linux/drivers/media/common/tuners/xc5000_priv.h
--- a/linux/drivers/media/common/tuners/xc5000_priv.h Fri Sep 05 10:20:56
2008 -0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,37 +0,0 @@
-/*
- * Driver for Xceive XC5000 "QAM/8VSB single chip tuner"
- *
- * Copyright (c) 2007 Steven Toth <[EMAIL PROTECTED]>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#ifndef XC5000_PRIV_H
-#define XC5000_PRIV_H
-
-struct xc5000_priv {
- struct xc5000_config *cfg;
- struct i2c_adapter *i2c;
-
- u32 freq_hz;
- u32 bandwidth;
- u8 video_standard;
- u8 rf_mode;
-
- void *devptr;
-};
-
-#endif
---
Patch is available at:
http://linuxtv.org/hg/v4l-dvb/rev/6ac538c97b7271768fea751b7c42ebb46f5950dd
_______________________________________________
linuxtv-commits mailing list
linuxtv-commits@linuxtv.org
http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
