diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-09-18 23:56:50 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-09-18 23:56:50 -0300 |
| commit | 034d0acc1b03bd1d68b729ea719978961628dd2a (patch) | |
| tree | 37d1972d39ab6a125e483ae293f8f205303c6921 /linux/drivers/media/video/v4l2-device.c | |
| parent | 6d20e235949a06a88588f8fcc0bcddce7e3a2924 (diff) | |
| parent | 7921b528872c180d255e21140cd54502dda70a7a (diff) | |
| download | mediapointer-dvb-s2-034d0acc1b03bd1d68b729ea719978961628dd2a.tar.gz mediapointer-dvb-s2-034d0acc1b03bd1d68b729ea719978961628dd2a.tar.bz2 | |
merge: http://www.linuxtv.org/hg/~dougsland/v4l-dvb
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/video/v4l2-device.c')
| -rw-r--r-- | linux/drivers/media/video/v4l2-device.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linux/drivers/media/video/v4l2-device.c b/linux/drivers/media/video/v4l2-device.c index 655d19cd6..016c62f6c 100644 --- a/linux/drivers/media/video/v4l2-device.c +++ b/linux/drivers/media/video/v4l2-device.c @@ -86,7 +86,7 @@ void v4l2_device_unregister(struct v4l2_device *v4l2_dev) /* 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 defined(CONFIG_I2C) || (defined(CONFIG_I2C_MODULE) && defined(MODULE)) #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 26) if (sd->flags & V4L2_SUBDEV_FL_IS_I2C) { struct i2c_client *client = v4l2_get_subdevdata(sd); |