[kernel] r11675 - in dists/trunk/linux-2.6/debian: . config

[Maximilian Attems]

Author: maks
Date: Sat Jun 21 08:24:49 2008
New Revision: 11675

Log:
Fallback for userspace compatibility to old IEEE 1394 FireWire stack.

Kino has not yet the code ready and other relevant libs are not compiled with
the juju flags. take to account current userspace status for Lenny release.

post Lenny there will not be many excuses left.
will be reverted back as soon as 2.6.27.

Modified:
   dists/trunk/linux-2.6/debian/changelog
   dists/trunk/linux-2.6/debian/config/config

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	(original)
+++ dists/trunk/linux-2.6/debian/changelog	Sat Jun 21 08:24:49 2008
@@ -47,6 +47,8 @@
   * Add request_firmware patch for acenic. (closes: #284221)
   * [x86, ia64]: Set HPET_RTC_IRQ. (closes: #479709)
   * [ppc]: Set SND_VIRMIDI. (closes: #290090)
+  * Fallback for userspace compatibility to old IEEE 1394 FireWire stack.
+    (closes: #475295, #478419)
 
   [ Martin Michlmayr ]
   * [arm/orion5x] Update the config to reflect upstream renaming this

Modified: dists/trunk/linux-2.6/debian/config/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/config	(original)
+++ dists/trunk/linux-2.6/debian/config/config	Sat Jun 21 08:24:49 2008
@@ -252,9 +252,7 @@
 ##
 ## file: drivers/firewire/Kconfig
 ##
-CONFIG_FIREWIRE=m
-CONFIG_FIREWIRE_OHCI=m
-CONFIG_FIREWIRE_SBP2=m
+# CONFIG_FIREWIRE is not set
 
 ##
 ## file: drivers/hid/Kconfig
@@ -348,7 +346,16 @@
 ##
 ## file: drivers/ieee1394/Kconfig
 ##
-# CONFIG_IEEE1394 is not set
+CONFIG_IEEE1394=m
+# CONFIG_IEEE1394_VERBOSEDEBUG is not set
+CONFIG_IEEE1394_PCILYNX=m
+CONFIG_IEEE1394_OHCI1394=m
+CONFIG_IEEE1394_VIDEO1394=m
+CONFIG_IEEE1394_SBP2=m
+# CONFIG_IEEE1394_SBP2_PHYS_DMA is not set
+CONFIG_IEEE1394_ETH1394=m
+CONFIG_IEEE1394_DV1394=m
+CONFIG_IEEE1394_RAWIO=m
 
 ##
 ## file: drivers/infiniband/Kconfig