diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-01-29 16:32:35 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-01-29 16:32:35 -0200 |
| commit | 7913005c82ce9ebc130fb4e39927e6f4965e62da (patch) | |
| tree | 048dd1addee52488b21388482cedde20317cafaa /linux/drivers/media/video/Makefile | |
| parent | 2329b257936fc4fac065abf560327406469bbb57 (diff) | |
| download | mediapointer-dvb-s2-7913005c82ce9ebc130fb4e39927e6f4965e62da.tar.gz mediapointer-dvb-s2-7913005c82ce9ebc130fb4e39927e6f4965e62da.tar.bz2 | |
Fix bug #9833: regression when compiling V4L without I2C
From: Mauro Carvalho Chehab <mchehab@infradead.org>
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 'linux/drivers/media/video/Makefile')
| -rw-r--r-- | linux/drivers/media/video/Makefile | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/linux/drivers/media/video/Makefile b/linux/drivers/media/video/Makefile index 28ddd146c..991f8de0a 100644 --- a/linux/drivers/media/video/Makefile +++ b/linux/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 |