[Maverick] switch to new firewire stack.

Andy Whitcroft apw at canonical.com
Thu Jun 17 09:19:30 UTC 2010


On Wed, Jun 16, 2010 at 12:45:04PM -0500, Manoj Iyer wrote:

> # Bazaar merge directive format 2 (Bazaar 0.90)
> # revision_id: manoj.iyer at canonical.com-20100615183844-\
> #   w76q9m8piz9rwnct
> # target_branch: bzr+ssh://bazaar.launchpad.net/~ubuntu-\
> #   branches/ubuntu/maverick/module-init-tools/maverick/
> # testament_sha1: cc3e9eb552c741535f6c12fbf826c1dc5f17f4f9
> # timestamp: 2010-06-15 13:42:49 -0500
> # base_revision_id: scott at netsplit.com-20100607153501-04lamqgljxjgmhbt
> # # Begin patch
> === modified file 'debian/modprobe.d/blacklist-firewire.conf'
> --- debian/modprobe.d/blacklist-firewire.conf	2009-03-09 13:33:38 +0000
> +++ debian/modprobe.d/blacklist-firewire.conf	2010-06-15 18:38:44 +0000
> @@ -1,10 +1,8 @@
>  # 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
> +blacklist ohci1394
> +blacklist sbp2
> +blacklist eth1394
> +blacklist dv1394
> +blacklist raw1394
> +blacklist video1394

I think it might make more sense to just switch the commenting, you are
removing the new ones so its harder for someone to revert back to
confirm a problem with the new stack.

-apw




More information about the kernel-team mailing list