summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--linux/drivers/media/video/Makefile2
-rw-r--r--v4l/ChangeLog7
2 files changed, 8 insertions, 1 deletions
diff --git a/linux/drivers/media/video/Makefile b/linux/drivers/media/video/Makefile
index f24bc360b..618a08ab9 100644
--- a/linux/drivers/media/video/Makefile
+++ b/linux/drivers/media/video/Makefile
@@ -37,7 +37,7 @@ obj-$(CONFIG_VIDEO_CPIA) += cpia.o
obj-$(CONFIG_VIDEO_CPIA_PP) += cpia_pp.o
obj-$(CONFIG_VIDEO_CPIA_USB) += cpia_usb.o
obj-$(CONFIG_VIDEO_MEYE) += meye.o
-obj-$(CONFIG_VIDEO_SAA7134) += saa7134/
+obj-$(CONFIG_VIDEO_SAA7134) += ir-kbd-i2c.o saa7134/
obj-$(CONFIG_VIDEO_CX88) += cx88/
obj-$(CONFIG_VIDEO_EM28XX) += em28xx/
obj-$(CONFIG_VIDEO_EM28XX) += saa711x.o tvp5150.o
diff --git a/v4l/ChangeLog b/v4l/ChangeLog
index 53c9deda3..bb724fbde 100644
--- a/v4l/ChangeLog
+++ b/v4l/ChangeLog
@@ -1,3 +1,10 @@
+2005-11-12 00:06 mchehab
+
+ * ../linux/drivers/media/video/Makefile:
+ - Fixed broken dependency needed for sa7134 module.
+
+ Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
+
2005-11-11 21:26 mkrufky
* ../linux/drivers/media/video/cx25840/cx25840-firmware.c: