[kernel] r9482 - in dists/trunk/linux-modules-contrib-2.6: . debian ivtv

[Steve Langasek]

Author: vorlon
Date: Mon Sep 10 05:09:22 2007
New Revision: 9482

Log:
Re-enable ivtv
Drop ivtv.ko from debian/ivtv/rules; the reason this module isn't built is
because it's now included upstream



Modified:
   dists/trunk/linux-modules-contrib-2.6/debian/changelog
   dists/trunk/linux-modules-contrib-2.6/defines
   dists/trunk/linux-modules-contrib-2.6/ivtv/rules

Modified: dists/trunk/linux-modules-contrib-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-modules-contrib-2.6/debian/changelog	(original)
+++ dists/trunk/linux-modules-contrib-2.6/debian/changelog	Mon Sep 10 05:09:22 2007
@@ -1,3 +1,11 @@
+linux-modules-contrib-2.6 (2.6.22-3) UNRELEASED; urgency=low
+
+  * Re-enable ivtv
+  * Drop ivtv.ko from ivtv/rules; the reason this module isn't built
+    is because it's now included upstream
+
+ -- Steve Langasek <vorlon at debian.org>  Sun, 09 Sep 2007 22:06:07 -0700
+
 linux-modules-contrib-2.6 (2.6.22-2) unstable; urgency=low
 
   * Update to 2.6.22-2.

Modified: dists/trunk/linux-modules-contrib-2.6/defines
==============================================================================
--- dists/trunk/linux-modules-contrib-2.6/defines	(original)
+++ dists/trunk/linux-modules-contrib-2.6/defines	Mon Sep 10 05:09:22 2007
@@ -1,4 +1,4 @@
 [base]
 modules:
  ipw3945
-
+ ivtv

Modified: dists/trunk/linux-modules-contrib-2.6/ivtv/rules
==============================================================================
--- dists/trunk/linux-modules-contrib-2.6/ivtv/rules	(original)
+++ dists/trunk/linux-modules-contrib-2.6/ivtv/rules	Mon Sep 10 05:09:22 2007
@@ -5,6 +5,5 @@
 	touch $@
 
 install:
-	install -D -m 0644 $(CURDIR)/$(DIR)/driver/ivtv.ko $(PACKAGE_DIR)/lib/modules/$(REAL_VERSION)/contrib/$(MODULE)/ivtv.ko
 	install -D -m 0644 $(CURDIR)/$(DIR)/driver/ivtv-fb.ko $(PACKAGE_DIR)/lib/modules/$(REAL_VERSION)/contrib/$(MODULE)/ivtv-fb.ko
 	install -D -m 0644 $(CURDIR)/$(DIR)/i2c-drivers/saa717x.ko $(PACKAGE_DIR)/lib/modules/$(REAL_VERSION)/contrib/$(MODULE)/saa717x.ko