Commit 1ae0d202 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab

[media] cx88: fix build when VP3054=m and CX88_DVB=y

As reported by Jim Davis <jim.epost@gmail.com>:

randconfig build error with next-20130813, in drivers/media/pci/cx88,
when:
	CONFIG_VIDEO_CX88=y
	CONFIG_VIDEO_CX88_BLACKBIRD=m
	CONFIG_VIDEO_CX88_DVB=y
	CONFIG_VIDEO_CX88_VP3054=m
	CONFIG_VIDEO_CX88_MPEG=y

  LD      init/built-in.o
drivers/built-in.o: In function `cx8802_dvb_remove':
cx88-dvb.c:(.text+0x3a9914): undefined reference to `vp3054_i2c_remove'
drivers/built-in.o: In function `cx8802_dvb_probe':
cx88-dvb.c:(.text+0x3a9c4b): undefined reference to `vp3054_i2c_probe'
make: *** [vmlinux] Error 1

That happens because the vp3054 symbols aren't available builtin.
So, make it builtin, if CX88_DVB=y, or module otherwise, if this
support is selected.
Reported-by: default avatarJim Davis <jim.epost@gmail.com>
Signed-off-by: default avatarMauro Carvalho Chehab <m.chehab@samsung.com>
parent 6c84b214
...@@ -72,9 +72,9 @@ config VIDEO_CX88_DVB ...@@ -72,9 +72,9 @@ config VIDEO_CX88_DVB
To compile this driver as a module, choose M here: the To compile this driver as a module, choose M here: the
module will be called cx88-dvb. module will be called cx88-dvb.
config VIDEO_CX88_VP3054 config VIDEO_CX88_ENABLE_VP3054
tristate "VP-3054 Secondary I2C Bus Support" bool "VP-3054 Secondary I2C Bus Support"
default m default y
depends on VIDEO_CX88_DVB && DVB_MT352 depends on VIDEO_CX88_DVB && DVB_MT352
---help--- ---help---
This adds DVB-T support for cards based on the This adds DVB-T support for cards based on the
...@@ -82,6 +82,11 @@ config VIDEO_CX88_VP3054 ...@@ -82,6 +82,11 @@ config VIDEO_CX88_VP3054
which also require support for the VP-3054 which also require support for the VP-3054
Secondary I2C bus, such at DNTV Live! DVB-T Pro. Secondary I2C bus, such at DNTV Live! DVB-T Pro.
config VIDEO_CX88_VP3054
tristate
depends on VIDEO_CX88_DVB && VIDEO_CX88_ENABLE_VP3054
default y
config VIDEO_CX88_MPEG config VIDEO_CX88_MPEG
tristate tristate
depends on VIDEO_CX88_DVB || VIDEO_CX88_BLACKBIRD depends on VIDEO_CX88_DVB || VIDEO_CX88_BLACKBIRD
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment