diff options
| author | Ricardo Cerqueira <devnull@localhost> | 2005-12-10 17:51:31 +0000 |
|---|---|---|
| committer | Ricardo Cerqueira <devnull@localhost> | 2005-12-10 17:51:31 +0000 |
| commit | 8b3be7709f039bc44be8053681f2e94cae69d5db (patch) | |
| tree | 52152b8419df847a5039f19e61aa7da84ede2852 /linux/drivers/media/video/Makefile | |
| parent | e16ce4ced092fb2227e41ae9773a1c5b3e7ca5fd (diff) | |
| download | mediapointer-dvb-s2-8b3be7709f039bc44be8053681f2e94cae69d5db.tar.gz mediapointer-dvb-s2-8b3be7709f039bc44be8053681f2e94cae69d5db.tar.bz2 | |
ir-kbd-gpio is now part of bttv
From: Ricardo Cerqueira <v4l@cerqueira.org>
Merged ir-kbd-gpio into bttv as bttv-input, for consistency with other
input modules
Signed-off-by: Ricardo Cerqueira <v4l@cerqueira.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 618a08ab9..49aae8a54 100644 --- a/linux/drivers/media/video/Makefile +++ b/linux/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 |