Messages in this thread | | | Date | Mon, 22 Oct 2007 07:41:18 -0400 | From | Michael Krufky <> | Subject | Re: [v4l-dvb-maintainer] [2.6 patch] fix CONFIG_TUNER_TEA5761=m |
| |
Trent Piepho wrote: > On Sun, 21 Oct 2007, Michael Krufky wrote: > >> Adrian Bunk wrote: >> >>> This patch fixes CONFIG_TUNER_TEA5761=m broken by >>> commit ca805d57cf5ea7482ed3da28653f30621249ee45. >>> >>> Signed-off-by: Adrian Bunk <bunk@kernel.org> >>> >>> --- >>> >>> drivers/media/video/tuner-core.c | 6 ------ >>> 1 file changed, 6 deletions(-) >>> >>> 26336c30e76c37bda368a24b8b12978388a18cf3 >>> diff --git a/drivers/media/video/tuner-core.c b/drivers/media/video/tuner-core.c >>> index 9484308..1795b78 100644 >>> --- a/drivers/media/video/tuner-core.c >>> +++ b/drivers/media/video/tuner-core.c >>> @@ -30,9 +30,7 @@ >>> >>> /* standard i2c insmod options */ >>> static unsigned short normal_i2c[] = { >>> -#ifdef CONFIG_TUNER_TEA5761 >>> 0x10, >>> -#endif >>> >>> >> ^^^ I believe that we want to keep these #ifdef's above... The removals >> below are fine. >> > > Won't leaving in the call to tea5761_autodetection() when tea5761 is not > compiled in result in an undefined symbol error? > It shouldn't -- See tea5761.h ... If the module is not selected, then a stub will report that the driver was disabled by Kconfig. > I think what we want to do put in the typical if(TEA5761 >= TUNER) include tea5761 > code in tuner logic that the rest of the selectable sub-driver use. > > #if defined(CONFIG_TUNER_TEA5761) || (defined(CONFIG_TUNER_TEA5761_MODULE) && defined(MODULE)) > This is what I have in my tree here... ^^^ Isn't this already upstream by now?
-Mike - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |