summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--v4l/ChangeLog9
-rw-r--r--v4l_experimental/pvrusb2/Kbuild2
2 files changed, 10 insertions, 1 deletions
diff --git a/v4l/ChangeLog b/v4l/ChangeLog
index abbbdd109..d376fc7a9 100644
--- a/v4l/ChangeLog
+++ b/v4l/ChangeLog
@@ -1,3 +1,12 @@
+2005-12-02 13:33 mcisely
+
+ * ../v4l_experimental/pvrusb2/Kbuild:
+
+ - Remove addition of tveeprom.o to Kbuild, caused by an accidental
+ commit from mchehab
+
+ Signed-off-by: Mike Isely <isely@pobox.com>
+
2005-12-02 13:27 mcisely
* ../v4l_experimental/pvrusb2/pvrusb2-eeprom.c:
diff --git a/v4l_experimental/pvrusb2/Kbuild b/v4l_experimental/pvrusb2/Kbuild
index 488633837..2166db3e7 100644
--- a/v4l_experimental/pvrusb2/Kbuild
+++ b/v4l_experimental/pvrusb2/Kbuild
@@ -17,7 +17,7 @@ pvrusb2-objs := \
pvrusb2-debugifc.o \
$(END)
-obj-$(CONFIG_VIDEO_PVRUSB2) += pvrusb2.o tveeprom.o
+obj-$(CONFIG_VIDEO_PVRUSB2) += pvrusb2.o
# Stuff for Emacs to see, in order to encourage consistent editing style:
# *** Local Variables: ***