diff options
| author | Johannes Stezenbach <devnull@localhost> | 2004-06-07 17:26:17 +0000 |
|---|---|---|
| committer | Johannes Stezenbach <devnull@localhost> | 2004-06-07 17:26:17 +0000 |
| commit | a71510115b990965e7f6ecd6d233039a0d82507e (patch) | |
| tree | d1420778d09b61b5441b9ca25f7dd777dbc1c544 /linux/drivers/media/dvb/frontends/stv0299.c | |
| parent | c36dd8a295b3570428cf5d94678ed9f22742f0fc (diff) | |
| download | mediapointer-dvb-s2-a71510115b990965e7f6ecd6d233039a0d82507e.tar.gz mediapointer-dvb-s2-a71510115b990965e7f6ecd6d233039a0d82507e.tar.bz2 | |
cleanup patch by Kenneth Aafløy
Diffstat (limited to 'linux/drivers/media/dvb/frontends/stv0299.c')
| -rw-r--r-- | linux/drivers/media/dvb/frontends/stv0299.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/linux/drivers/media/dvb/frontends/stv0299.c b/linux/drivers/media/dvb/frontends/stv0299.c index 4ec231c02..0f89b2f14 100644 --- a/linux/drivers/media/dvb/frontends/stv0299.c +++ b/linux/drivers/media/dvb/frontends/stv0299.c @@ -65,7 +65,6 @@ #endif static int stv0299_status = 0; -static int disable_typhoon = 0; #define STATUS_BER 0 #define STATUS_UCBLOCKS 1 @@ -1277,6 +1276,8 @@ static long probe_tuner (struct i2c_adapter *adapter) printk ("%s: try to attach to %s\n", __FUNCTION__, adapter->name); + // FIXME: Can't we bring some sort of ID in here? + // adapter->id? if ( strcmp(adapter->name, "Technisat SkyStar2 driver") == 0 ) { printk ("%s: setup for tuner Samsung TBMU24112IMB\n", __FILE__); @@ -1299,8 +1300,7 @@ static long probe_tuner (struct i2c_adapter *adapter) } if ((ret = i2c_transfer(i2c, msg2, 2)) == 2) { - if ( strcmp(adapter->name, "KNC1 DVB-S") == 0 && - !disable_typhoon ) + if ( strcmp(adapter->name, "KNC1 DVB-S") == 0 ) { // Typhoon cards have unusual wiring. printk ("%s: setup for tuner SU1278 (TSA5059 synth) on" @@ -1446,11 +1446,10 @@ module_init (init_uni0299); module_exit (exit_uni0299); MODULE_DESCRIPTION("Universal STV0299/TSA5059/SL1935 DVB Frontend driver"); -MODULE_AUTHOR("Ralph Metzler, Holger Waechtler, Peter Schildmann, Felix Domke, Andreas Oberritter, Andrew de Quincey"); +MODULE_AUTHOR("Ralph Metzler, Holger Waechtler, Peter Schildmann, Felix Domke, " + "Andreas Oberritter, Andrew de Quincey, Kenneth Aafløy"); MODULE_LICENSE("GPL"); MODULE_PARM(stv0299_status, "i"); MODULE_PARM_DESC(stv0299_status, "Which status value to support (0: BER, 1: UCBLOCKS)"); -MODULE_PARM(disable_typhoon, "i"); -MODULE_PARM_DESC(disable_typhoon, "Disable support for Philips SU1278 on Typhoon hardware."); |