diff options
| author | Ricardo Cerqueira <v4l@cerqueira.org> | 2006-01-09 15:25:25 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@brturbo.com.br> | 2006-01-09 15:25:25 -0200 |
| commit | 4abdfed5676e5ef7f2461bb76f5929068a9cc9cf (patch) | |
| tree | ff4e3e80f57f788a9cf450966f137c44b58ff1b2 /drivers/media/video/Makefile | |
| parent | e0b2d7a89bb250fb0c9068c4481c9fd26c3fb227 (diff) | |
| download | lwn-4abdfed5676e5ef7f2461bb76f5929068a9cc9cf.tar.gz lwn-4abdfed5676e5ef7f2461bb76f5929068a9cc9cf.zip | |
V4L/DVB (3161): ir-kbd-gpio is now part of bttv
- Merged ir-kbd-gpio into bttv as bttv-input, for consistency with other
input modules
Signed-off-by: Ricardo Cerqueira <v4l@cerqueira.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
Diffstat (limited to 'drivers/media/video/Makefile')
| -rw-r--r-- | drivers/media/video/Makefile | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/media/video/Makefile b/drivers/media/video/Makefile index 618a08ab940a..49aae8a54aa4 100644 --- a/drivers/media/video/Makefile +++ b/drivers/media/video/Makefile @@ -3,7 +3,8 @@ # bttv-objs := bttv-driver.o bttv-cards.o bttv-if.o \ - bttv-risc.o bttv-vbi.o bttv-i2c.o bttv-gpio.o + bttv-risc.o bttv-vbi.o bttv-i2c.o bttv-gpio.o \ + bttv-input.o zoran-objs := zr36120.o zr36120_i2c.o zr36120_mem.o zr36067-objs := zoran_procfs.o zoran_device.o \ zoran_driver.o zoran_card.o @@ -12,7 +13,7 @@ tuner-objs := tuner-core.o tuner-simple.o mt20xx.o tda8290.o tea5767.o obj-$(CONFIG_VIDEO_DEV) += videodev.o v4l2-common.o v4l1-compat.o compat_ioctl32.o obj-$(CONFIG_VIDEO_BT848) += bttv.o msp3400.o tvaudio.o \ - tda7432.o tda9875.o ir-kbd-i2c.o ir-kbd-gpio.o + tda7432.o tda9875.o ir-kbd-i2c.o obj-$(CONFIG_SOUND_TVMIXER) += tvmixer.o obj-$(CONFIG_VIDEO_ZR36120) += zoran.o |