Re: linux-next: Tree for March 23 (media/video/hdpvr)

[Janne Grunau <j@jannau.net>]

[-- Attachment #1: Type: text/plain, Size: 585 bytes --]

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

[-- Attachment #2: hdpvr_without_i2c.diff --]
[-- Type: text/plain, Size: 1300 bytes --]

make hdpvr build without CONFIG_I2C

Signed-off-by: Janne Grunau <j@jannau.net>
---
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 <linux/usb.h>
 #include <linux/mutex.h>
 #include <linux/i2c.h>
+#include <linux/autoconf.h>
 
 #include <linux/videodev2.h>
 #include <media/v4l2-dev.h>
@@ -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);