summaryrefslogtreecommitdiff
path: root/linux/drivers/usb
diff options
context:
space:
mode:
authorNickolay V. Shmyrev <devnull@localhost>2005-10-06 18:10:30 +0000
committerNickolay V. Shmyrev <devnull@localhost>2005-10-06 18:10:30 +0000
commit9c2f6317a3233e4cc06ff19f37beab6ccead5e23 (patch)
tree5872d62d4979f7a8c42d3b4133fd5bc2b9703773 /linux/drivers/usb
parentdd95dd37f98ff4756ad1fcd1d2e66649c1853dff (diff)
downloadmediapointer-dvb-s2-9c2f6317a3233e4cc06ff19f37beab6ccead5e23.tar.gz
mediapointer-dvb-s2-9c2f6317a3233e4cc06ff19f37beab6ccead5e23.tar.bz2
* Makefile:
* em2820-i2c.c: (em2820_set_tuner): - Fixed build. Signed-off-by: Nickolay V. Shmyrev <nshmyrev@yandex.ru>
Diffstat (limited to 'linux/drivers/usb')
-rw-r--r--linux/drivers/usb/media/em2820-i2c.c10
1 files changed, 1 insertions, 9 deletions
diff --git a/linux/drivers/usb/media/em2820-i2c.c b/linux/drivers/usb/media/em2820-i2c.c
index 1e865f8b2..f3d8b4cf9 100644
--- a/linux/drivers/usb/media/em2820-i2c.c
+++ b/linux/drivers/usb/media/em2820-i2c.c
@@ -279,16 +279,8 @@ static void dec_use(struct i2c_adapter *adap)
static int em2820_set_tuner(int check_eeprom, struct i2c_client *client)
{
struct em2820 *dev = client->adapter->algo_data;
-
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,13)
struct tuner_setup tun_setup;
-#endif
- /* tuner */
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,13)
- if (dev->has_tuner)
- em2820_i2c_call_clients(dev, TUNER_SET_TYPE, &dev->tuner_type);
-#else
if (dev->has_tuner) {
tun_setup.mode_mask = T_ANALOG_TV | T_RADIO;
tun_setup.type = dev->tuner_type;
@@ -296,7 +288,7 @@ static int em2820_set_tuner(int check_eeprom, struct i2c_client *client)
em2820_i2c_call_clients(dev, TUNER_SET_TYPE_ADDR, &tun_setup);
}
-#endif
+
return (0);
}