On Mon, May 11, 2009 at 09:37:41AM -0700, Randy Dunlap wrote: > From: Randy Dunlap <randy.dunlap@xxxxxxxxxx> > > Build fails when CONFIG_I2C=n, so handle that case in the if block: > > drivers/built-in.o: In function `v4l2_device_unregister': > (.text+0x157821): undefined reference to `i2c_unregister_device' > > Signed-off-by: Randy Dunlap <randy.dunlap@xxxxxxxxxx> This patch still has not been applied as far as I can tell, and builds are still broken as a result, almost 2 weeks after the fact. > --- > drivers/media/video/v4l2-device.c | 2 ++ > 1 file changed, 2 insertions(+) > > --- linux-next-20090511.orig/drivers/media/video/v4l2-device.c > +++ linux-next-20090511/drivers/media/video/v4l2-device.c > @@ -85,6 +85,7 @@ void v4l2_device_unregister(struct v4l2_ > /* Unregister subdevs */ > list_for_each_entry_safe(sd, next, &v4l2_dev->subdevs, list) { > v4l2_device_unregister_subdev(sd); > +#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE) > if (sd->flags & V4L2_SUBDEV_FL_IS_I2C) { > struct i2c_client *client = v4l2_get_subdevdata(sd); > > @@ -95,6 +96,7 @@ void v4l2_device_unregister(struct v4l2_ > if (client) > i2c_unregister_device(client); > } > +#endif > } > } > EXPORT_SYMBOL_GPL(v4l2_device_unregister); > > > -- > ~Randy > LPC 2009, Sept. 23-25, Portland, Oregon > http://linuxplumbersconf.org/2009/ > -- > To unsubscribe from this list: send the line "unsubscribe linux-next" in > the body of a message to majordomo@xxxxxxxxxxxxxxx > More majordomo info at http://vger.kernel.org/majordomo-info.html -- To unsubscribe from this list: send the line "unsubscribe linux-next" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html