diff options
-rw-r--r-- | drivers/media/Kconfig | 4 | ||||
-rw-r--r-- | drivers/media/video/Makefile | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/drivers/media/Kconfig b/drivers/media/Kconfig index 624b21cef5b3..d9d033e07e19 100644 --- a/drivers/media/Kconfig +++ b/drivers/media/Kconfig | |||
@@ -80,8 +80,12 @@ config VIDEO_BUF_DVB | |||
80 | config VIDEO_BTCX | 80 | config VIDEO_BTCX |
81 | tristate | 81 | tristate |
82 | 82 | ||
83 | config VIDEO_IR_I2C | ||
84 | tristate | ||
85 | |||
83 | config VIDEO_IR | 86 | config VIDEO_IR |
84 | tristate | 87 | tristate |
88 | select VIDEO_IR_I2C if I2C | ||
85 | 89 | ||
86 | config VIDEO_TVEEPROM | 90 | config VIDEO_TVEEPROM |
87 | tristate | 91 | tristate |
diff --git a/drivers/media/video/Makefile b/drivers/media/video/Makefile index cb942fbdffa9..4cddc8cbd341 100644 --- a/drivers/media/video/Makefile +++ b/drivers/media/video/Makefile | |||
@@ -20,7 +20,7 @@ ifeq ($(CONFIG_VIDEO_V4L1_COMPAT),y) | |||
20 | endif | 20 | endif |
21 | 21 | ||
22 | obj-$(CONFIG_VIDEO_BT848) += bt8xx/ | 22 | obj-$(CONFIG_VIDEO_BT848) += bt8xx/ |
23 | obj-$(CONFIG_VIDEO_BT848) += ir-kbd-i2c.o | 23 | obj-$(CONFIG_VIDEO_IR_I2C) += ir-kbd-i2c.o |
24 | obj-$(CONFIG_VIDEO_TVAUDIO) += tvaudio.o | 24 | obj-$(CONFIG_VIDEO_TVAUDIO) += tvaudio.o |
25 | obj-$(CONFIG_VIDEO_TDA7432) += tda7432.o | 25 | obj-$(CONFIG_VIDEO_TDA7432) += tda7432.o |
26 | obj-$(CONFIG_VIDEO_TDA9875) += tda9875.o | 26 | obj-$(CONFIG_VIDEO_TDA9875) += tda9875.o |
@@ -63,7 +63,7 @@ obj-$(CONFIG_VIDEO_CPIA) += cpia.o | |||
63 | obj-$(CONFIG_VIDEO_CPIA_PP) += cpia_pp.o | 63 | obj-$(CONFIG_VIDEO_CPIA_PP) += cpia_pp.o |
64 | obj-$(CONFIG_VIDEO_CPIA_USB) += cpia_usb.o | 64 | obj-$(CONFIG_VIDEO_CPIA_USB) += cpia_usb.o |
65 | obj-$(CONFIG_VIDEO_MEYE) += meye.o | 65 | obj-$(CONFIG_VIDEO_MEYE) += meye.o |
66 | obj-$(CONFIG_VIDEO_SAA7134) += ir-kbd-i2c.o saa7134/ | 66 | obj-$(CONFIG_VIDEO_SAA7134) += saa7134/ |
67 | obj-$(CONFIG_VIDEO_CX88) += cx88/ | 67 | obj-$(CONFIG_VIDEO_CX88) += cx88/ |
68 | obj-$(CONFIG_VIDEO_IVTV) += ivtv/ | 68 | obj-$(CONFIG_VIDEO_IVTV) += ivtv/ |
69 | obj-$(CONFIG_VIDEO_EM28XX) += em28xx/ | 69 | obj-$(CONFIG_VIDEO_EM28XX) += em28xx/ |