diff options
| -rw-r--r-- | linux/drivers/media/video/em28xx/em28xx-i2c.c | 10 | ||||
| -rw-r--r-- | linux/drivers/usb/media/em2820-i2c.c | 10 | ||||
| -rw-r--r-- | v4l/ChangeLog | 8 | ||||
| -rw-r--r-- | v4l/Makefile | 1 |
4 files changed, 10 insertions, 19 deletions
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); } diff --git a/v4l/ChangeLog b/v4l/ChangeLog index df2156c9f..2d0a7de09 100644 --- a/v4l/ChangeLog +++ b/v4l/ChangeLog @@ -1,3 +1,11 @@ +2005-10-06 16:10 nshmyrev + + * Makefile: + * em2820-i2c.c: (em2820_set_tuner): + - Fixed build. + + Signed-off-by: Nickolay V. Shmyrev <nshmyrev@yandex.ru> + 2005-10-06 15:27 mchehab * doc/CARDLIST.em2820: diff --git a/v4l/Makefile b/v4l/Makefile index 8277180eb..ca9272d59 100644 --- a/v4l/Makefile +++ b/v4l/Makefile @@ -36,7 +36,6 @@ obj-$(CONFIG_VIDEO_BTTV) += btcx-risc.o ir-common.o bttv.o tveeprom.o obj-$(CONFIG_VIDEO_CX88) += btcx-risc.o cx88xx.o cx8800.o cx8802.o \ cx88-blackbird.o tveeprom.o obj-$(CONFIG_TVP5150) += tvp5150.o -obj-$(CONFIG_SAA7113) += saa7113.o obj-$(CONFIG_EM2820) += em2820.o # THIS IS NOT FINISHED YET --- IT IS HERE ONLY FOR DEVELOPERS !!!! |