From 9c2f6317a3233e4cc06ff19f37beab6ccead5e23 Mon Sep 17 00:00:00 2001 From: "Nickolay V. Shmyrev" Date: Thu, 6 Oct 2005 18:10:30 +0000 Subject: * Makefile: * em2820-i2c.c: (em2820_set_tuner): - Fixed build. Signed-off-by: Nickolay V. Shmyrev --- linux/drivers/media/video/em28xx/em28xx-i2c.c | 10 +--------- linux/drivers/usb/media/em2820-i2c.c | 10 +--------- 2 files changed, 2 insertions(+), 18 deletions(-) (limited to 'linux') diff --git a/linux/drivers/media/video/em28xx/em28xx-i2c.c b/linux/drivers/media/video/em28xx/em28xx-i2c.c index 1e865f8b2..f3d8b4cf9 100644 --- a/linux/drivers/media/video/em28xx/em28xx-i2c.c +++ b/linux/drivers/media/video/em28xx/em28xx-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); } 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); } -- cgit v1.2.3