[PATCH 2/2] module-init-tools: blacklist the new firewire modules

[Andy Whitcroft]

We are enabling both the old and new firewire stacks, for this to work
we need to blacklist one of them.  To maintain backwards compatibility
blacklist the new one.

Signed-off-by: Andy Whitcroft <apw at canonical.com>

diff -u module-init-tools-3.3-pre11/debian/changelog module-init-tools-3.3-pre11/debian/changelog
--- module-init-tools-3.3-pre11/debian/changelog
+++ module-init-tools-3.3-pre11/debian/changelog
@@ -1,3 +1,12 @@
+module-init-tools (3.3-pre11-4ubuntu19) intrepid; urgency=low
+
+  * We are enabling both the old and new firewire stacks, for this to work
+    we need to blacklist one of them.  To maintain backwards compatibility
+    blacklist the new one.
+    LP: #276463
+
+ -- Andy Whitcroft <apw at canonical.com>  Mon, 22 Dec 2008 11:35:49 +0000
+
 module-init-tools (3.3-pre11-4ubuntu18) intrepid; urgency=low
 
   *  Ensure we install blacklist-amd76-edac from LP: #297750, to ensure we
only in patch2:
unchanged:
--- module-init-tools-3.3-pre11.orig/extra/modprobe.d/blacklist-firewire
+++ module-init-tools-3.3-pre11/extra/modprobe.d/blacklist-firewire
@@ -0,0 +1,10 @@
+# Select the legacy firewire stack over the new CONFIG_FIREWIRE one.
+
+#blacklist ohci1394
+#blacklist sbp2
+#blacklist dv1394
+#blacklist raw1394
+#blacklist video1394
+
+blacklist firewire-ohci
+blacklist firewire-sbp2