From patchwork Mon Mar 23 20:49:40 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janne Grunau X-Patchwork-Id: 13823 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n2NKo345002171 for ; Mon, 23 Mar 2009 20:50:03 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750796AbZCWUuB (ORCPT ); Mon, 23 Mar 2009 16:50:01 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753536AbZCWUuB (ORCPT ); Mon, 23 Mar 2009 16:50:01 -0400 Received: from tichy.grunau.be ([85.131.189.73]:40241 "EHLO tichy.grunau.be" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750796AbZCWUuB (ORCPT ); Mon, 23 Mar 2009 16:50:01 -0400 Received: from localhost (unknown [78.52.196.249]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by tichy.grunau.be (Postfix) with ESMTPSA id 985EB90037; Mon, 23 Mar 2009 21:49:36 +0100 (CET) Date: Mon, 23 Mar 2009 21:49:40 +0100 From: Janne Grunau To: Randy Dunlap Cc: Stephen Rothwell , linux-next@vger.kernel.org, LKML , linux-media@vger.kernel.org Subject: Re: linux-next: Tree for March 23 (media/video/hdpvr) Message-ID: <20090323204940.GA5079@aniel> References: <20090323205454.d0cbf721.sfr@canb.auug.org.au> <49C7D965.5080202@oracle.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <49C7D965.5080202@oracle.com> User-Agent: Mutt/1.5.19 (2009-01-05) Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org Hi, On Mon, Mar 23, 2009 at 11:48:05AM -0700, Randy Dunlap wrote: > Stephen Rothwell wrote: > > > > Changes since 20090320: > > > The v4l-dvb tree gained a build failure for which I have reverted 3 commits. > > drivers/built-in.o: In function `hdpvr_disconnect': > hdpvr-core.c:(.text+0xf3894): undefined reference to `i2c_del_adapter' > drivers/built-in.o: In function `hdpvr_register_i2c_adapter': > (.text+0xf4145): undefined reference to `i2c_add_adapter' > > > CONFIG_I2C is not enabled. following patch should fix that. Janne ps: Mauro, I'll send a pull request shortly make hdpvr build without CONFIG_I2C Signed-off-by: Janne Grunau diff --git a/drivers/media/video/hdpvr/Makefile b/drivers/media/video/hdpvr/Makefile index 79ad2e1..145163b 100644 --- a/drivers/media/video/hdpvr/Makefile +++ b/drivers/media/video/hdpvr/Makefile @@ -1,4 +1,6 @@ -hdpvr-objs := hdpvr-control.o hdpvr-core.o hdpvr-i2c.o hdpvr-video.o +hdpvr-objs := hdpvr-control.o hdpvr-core.o hdpvr-video.o + +hdpvr-$(CONFIG_I2C) += hdpvr-i2c.o obj-$(CONFIG_VIDEO_HDPVR) += hdpvr.o diff --git a/drivers/media/video/hdpvr/hdpvr-core.c b/drivers/media/video/hdpvr/hdpvr-core.c index e7300b5..dadb2e7 100644 --- a/drivers/media/video/hdpvr/hdpvr-core.c +++ b/drivers/media/video/hdpvr/hdpvr-core.c @@ -21,6 +21,7 @@ #include #include #include +#include #include #include @@ -389,12 +390,14 @@ static void hdpvr_disconnect(struct usb_interface *interface) mutex_unlock(&dev->io_mutex); /* deregister I2C adapter */ +#ifdef CONFIG_I2C mutex_lock(&dev->i2c_mutex); if (dev->i2c_adapter) i2c_del_adapter(dev->i2c_adapter); kfree(dev->i2c_adapter); dev->i2c_adapter = NULL; mutex_unlock(&dev->i2c_mutex); +#endif /* CONFIG_I2C */ atomic_dec(&dev_nr);