From a42e607e67e8e72c2d5b29fac38dbe9efc842552 Mon Sep 17 00:00:00 2001 From: "Igor M. Liplianin" Date: Sun, 27 Feb 2011 18:08:46 -0300 Subject: [PATCH] --- yaml --- r: 241985 b: refs/heads/master c: 050b648e63b6a3afd22181d6c2113c315113e4db h: refs/heads/master i: 241983: fc33b4e21213bfe3b89f7bee7077c4ea88d85186 v: v3 --- [refs] | 2 +- trunk/drivers/media/video/cx23885/altera-ci.h | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 12da83a823fa..206c1e70ab04 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b00aff6a36aeafc68cf9044751041ba432ab4495 +refs/heads/master: 050b648e63b6a3afd22181d6c2113c315113e4db diff --git a/trunk/drivers/media/video/cx23885/altera-ci.h b/trunk/drivers/media/video/cx23885/altera-ci.h index ba0c6c05082a..bf0aa2c9b070 100644 --- a/trunk/drivers/media/video/cx23885/altera-ci.h +++ b/trunk/drivers/media/video/cx23885/altera-ci.h @@ -60,7 +60,6 @@ static inline int altera_ci_init(struct altera_ci_config *config, int ci_nr) static inline void altera_ci_release(void *dev, int ci_nr) { printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__); - return 0; } static inline int altera_ci_irq(void *dev) @@ -87,7 +86,6 @@ static inline int altera_hw_filt_init(struct altera_ci_config *config, static inline void altera_hw_filt_release(void *dev, int filt_nr) { printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__); - return 0; } static inline int altera_pid_feed_control(void *dev, int filt_nr,