summaryrefslogtreecommitdiffstats
path: root/drivers/media/video/Makefile
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2008-01-29 18:32:35 -0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2008-02-18 11:14:50 -0300
commita9254475bbfbed5f0596d952c6a3c9806e19dd0b (patch)
treef397e0332af0e2326e23a2f27db86c2262c5e755 /drivers/media/video/Makefile
parent1309d4e68497184d2fd87e892ddf14076c2bda98 (diff)
downloadkernel-crypto-a9254475bbfbed5f0596d952c6a3c9806e19dd0b.tar.gz
kernel-crypto-a9254475bbfbed5f0596d952c6a3c9806e19dd0b.tar.xz
kernel-crypto-a9254475bbfbed5f0596d952c6a3c9806e19dd0b.zip
V4L/DVB (7115): Fix bug #9833: regression when compiling V4L without I2C
Adrian Bunk reported: > > Commit 8ffbc6559493c64d6194c92d856196fdaeb8a5fb causes the following > > compile error with CONFIG_VIDEO_DEV=y/m, CONFIG_I2C=n: > > > > <-- snip --> > > > > ... > > MODPOST 26 modules > > ERROR: "i2c_attach_client" [drivers/media/video/v4l2-common.ko] undefined! > > make[2]: *** [__modpost] Error 1 > > > > <-- snip --> ... And what should happen if CONFIG_VIDEO_DEV=y, CONFIG_I2C=m? CC: Adrian Bunk <bunk@kernel.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/video/Makefile')
-rw-r--r--drivers/media/video/Makefile5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/media/video/Makefile b/drivers/media/video/Makefile
index 850b8c6f457..3f209b32eea 100644
--- a/drivers/media/video/Makefile
+++ b/drivers/media/video/Makefile
@@ -10,8 +10,9 @@ msp3400-objs := msp3400-driver.o msp3400-kthreads.o
stkwebcam-objs := stk-webcam.o stk-sensor.o
-obj-$(CONFIG_VIDEO_DEV) += videodev.o v4l2-common.o compat_ioctl32.o \
- v4l2-int-device.o
+obj-$(CONFIG_VIDEO_DEV) += videodev.o compat_ioctl32.o v4l2-int-device.o
+
+obj-$(CONFIG_VIDEO_V4L2_COMMON) += v4l2-common.o
ifeq ($(CONFIG_VIDEO_V4L1_COMPAT),y)
obj-$(CONFIG_VIDEO_DEV) += v4l1-compat.o