From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753997AbXJVDda (ORCPT ); Sun, 21 Oct 2007 23:33:30 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751308AbXJVDdX (ORCPT ); Sun, 21 Oct 2007 23:33:23 -0400 Received: from host06.hostingexpert.com ([216.80.70.60]:45709 "EHLO host06.hostingexpert.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751164AbXJVDdW (ORCPT ); Sun, 21 Oct 2007 23:33:22 -0400 Message-ID: <471C19F1.8090505@linuxtv.org> Date: Sun, 21 Oct 2007 23:33:05 -0400 From: Michael Krufky User-Agent: Thunderbird 1.5.0.13 (X11/20070824) MIME-Version: 1.0 To: Adrian Bunk CC: Mauro Carvalho Chehab , v4l-dvb-maintainer@linuxtv.org, linux-kernel@vger.kernel.org Subject: Re: [2.6 patch] fix CONFIG_TUNER_TEA5761=m References: <20071022024755.GJ30533@stusta.de> In-Reply-To: <20071022024755.GJ30533@stusta.de> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - host06.hostingexpert.com X-AntiAbuse: Original Domain - vger.kernel.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - linuxtv.org X-Source: X-Source-Args: X-Source-Dir: Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Adrian Bunk wrote: > This patch fixes CONFIG_TUNER_TEA5761=m broken by > commit ca805d57cf5ea7482ed3da28653f30621249ee45. > > Signed-off-by: Adrian Bunk > > --- > > 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. > 0x42, 0x43, 0x4a, 0x4b, /* tda8290 */ > 0x60, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, > 0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f, > @@ -292,7 +290,6 @@ static void set_type(struct i2c_client *c, unsigned int type, > } > t->mode_mask = T_RADIO; > break; > -#ifdef CONFIG_TUNER_TEA5761 > case TUNER_TEA5761: > if (tea5761_attach(&t->fe, t->i2c.adapter, t->i2c.addr) == NULL) { > t->type = TUNER_ABSENT; > @@ -301,7 +298,6 @@ static void set_type(struct i2c_client *c, unsigned int type, > } > t->mode_mask = T_RADIO; > break; > -#endif > case TUNER_PHILIPS_FMD1216ME_MK3: > buffer[0] = 0x0b; > buffer[1] = 0xdc; > @@ -594,7 +590,6 @@ static int tuner_attach(struct i2c_adapter *adap, int addr, int kind) > /* autodetection code based on the i2c addr */ > if (!no_autodetect) { > switch (addr) { > -#ifdef CONFIG_TUNER_TEA5761 > case 0x10: > if (tea5761_autodetection(t->i2c.adapter, t->i2c.addr) != EINVAL) { > t->type = TUNER_TEA5761; > @@ -606,7 +601,6 @@ static int tuner_attach(struct i2c_adapter *adap, int addr, int kind) > goto register_client; > } > break; > -#endif > case 0x42: > case 0x43: > case 0x4a: > > Regards, Mike Krufky