[PATCH 1/2] UBUNTU: enable the new firewire stack allowing parallel testing

[Andy Whitcroft]

Bug: #276463

The kernel now has two competing firewire (IEEE1394) stacks.  We are
following upstream recomendations and enabling the older legacy stack
for general use.  There are a number of requests to include the new
stack as well (as blacklisted modules) to allow simple switching to the
new stack for those who like to test the bleeding edge.

Enable the new firewire stack.  This does need a corresponding
module-init-tools change to ensure we do not load these.

Signed-off-by: Andy Whitcroft <apw at canonical.com>
---
 debian/config/amd64/config |    6 +++++-
 debian/config/i386/config  |    6 +++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/debian/config/amd64/config b/debian/config/amd64/config
index fa96ecd..88c9478 100644
--- a/debian/config/amd64/config
+++ b/debian/config/amd64/config
@@ -894,7 +894,11 @@ CONFIG_FDDI=y
 CONFIG_FEALNX=m
 CONFIG_FIB_RULES=y
 CONFIG_FILE_LOCKING=y
-# CONFIG_FIREWIRE is not set
+CONFIG_FIREWIRE=m
+CONFIG_FIREWIRE_OHCI=m
+CONFIG_FIREWIRE_OHCI_DEBUG=y
+# CONFIG_FIREWIRE_OHCI_REMOTE_DMA is not set
+CONFIG_FIREWIRE_SBP2=m
 CONFIG_FIRMWARE_EDID=y
 # CONFIG_FIRMWARE_IN_KERNEL is not set
 CONFIG_FIRMWARE_MEMMAP=y
diff --git a/debian/config/i386/config b/debian/config/i386/config
index e63a9ef..f2f27ee 100644
--- a/debian/config/i386/config
+++ b/debian/config/i386/config
@@ -949,7 +949,11 @@ CONFIG_FDDI=y
 CONFIG_FEALNX=m
 CONFIG_FIB_RULES=y
 CONFIG_FILE_LOCKING=y
-# CONFIG_FIREWIRE is not set
+CONFIG_FIREWIRE=m
+CONFIG_FIREWIRE_OHCI=m
+CONFIG_FIREWIRE_OHCI_DEBUG=y
+# CONFIG_FIREWIRE_OHCI_REMOTE_DMA is not set
+CONFIG_FIREWIRE_SBP2=m
 CONFIG_FIRMWARE_EDID=y
 # CONFIG_FIRMWARE_IN_KERNEL is not set
 CONFIG_FIRMWARE_MEMMAP=y
-- 
1.6.0.4.911.gc990