diff options
| author | Michael Krufky <mkrufky@linuxtv.org> | 2008-09-06 09:52:30 -0400 |
|---|---|---|
| committer | Michael Krufky <mkrufky@linuxtv.org> | 2008-09-06 09:52:30 -0400 |
| commit | fb493d2f08b44ff2b98cfe78e3a29d4ffb6e800c (patch) | |
| tree | 6b49d56f6cf62b22ff75fc893b31480457296274 /linux/drivers/media/common/tuners | |
| parent | 5f2d82cefe0ce930f3146875c88b993695c7e03a (diff) | |
| download | mediapointer-dvb-s2-fb493d2f08b44ff2b98cfe78e3a29d4ffb6e800c.tar.gz mediapointer-dvb-s2-fb493d2f08b44ff2b98cfe78e3a29d4ffb6e800c.tar.bz2 | |
xc5000: kill xc5000_priv.h
From: Michael Krufky <mkrufky@linuxtv.org>
move struct xc5000_priv into xc5000.c and delete xc5000_priv.h
Priority: normal
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Diffstat (limited to 'linux/drivers/media/common/tuners')
| -rw-r--r-- | linux/drivers/media/common/tuners/xc5000.c | 13 | ||||
| -rw-r--r-- | linux/drivers/media/common/tuners/xc5000_priv.h | 37 |
2 files changed, 12 insertions, 38 deletions
diff --git a/linux/drivers/media/common/tuners/xc5000.c b/linux/drivers/media/common/tuners/xc5000.c index 2c0a5b8d5..92b3ca786 100644 --- a/linux/drivers/media/common/tuners/xc5000.c +++ b/linux/drivers/media/common/tuners/xc5000.c @@ -30,7 +30,6 @@ #include "dvb_frontend.h" #include "xc5000.h" -#include "xc5000_priv.h" static int debug; module_param(debug, int, 0644); @@ -46,6 +45,18 @@ MODULE_PARM_DESC(init_fw, "Load firmware during driver initialization."); #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 #define XC_MAX_I2C_WRITE_LENGTH 64 diff --git a/linux/drivers/media/common/tuners/xc5000_priv.h b/linux/drivers/media/common/tuners/xc5000_priv.h deleted file mode 100644 index b2a0074c9..000000000 --- a/linux/drivers/media/common/tuners/xc5000_priv.h +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Driver for Xceive XC5000 "QAM/8VSB single chip tuner" - * - * Copyright (c) 2007 Steven Toth <stoth@linuxtv.org> - * - * 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 |