diff --git a/debian/changelog b/debian/changelog index 781aa4c4c..2da5d9787 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,10 @@ linux-2.6 (2.6.27~rc3-1~experimental.1) UNRELEASED; urgency=low - [ maximilian attems ] * New upstream release + [ maximilian attems ] + * Reenable new Juju firewire stack. + [ Martin Michlmayr ] * [mips/r4k-ip22, mips/sb1-bcm91250a] Don't build in ISO9660. diff --git a/debian/config/config b/debian/config/config index 8429c08a3..c7d5eb90f 100644 --- a/debian/config/config +++ b/debian/config/config @@ -252,7 +252,10 @@ CONFIG_EDAC_I82975X=m ## ## file: drivers/firewire/Kconfig ## -# CONFIG_FIREWIRE is not set +CONFIG_FIREWIRE=m +CONFIG_FIREWIRE_OHCI=m +CONFIG_FIREWIRE_SBP2=m + ## ## file: drivers/hid/Kconfig @@ -347,16 +350,7 @@ CONFIG_BLK_DEV_TC86C001=m ## ## file: drivers/ieee1394/Kconfig ## -CONFIG_IEEE1394=m -CONFIG_IEEE1394_OHCI1394=m -CONFIG_IEEE1394_PCILYNX=m -CONFIG_IEEE1394_SBP2=m -# CONFIG_IEEE1394_SBP2_PHYS_DMA is not set -CONFIG_IEEE1394_ETH1394=m -CONFIG_IEEE1394_RAWIO=m -CONFIG_IEEE1394_VIDEO1394=m -CONFIG_IEEE1394_DV1394=m -# CONFIG_IEEE1394_VERBOSEDEBUG is not set +# CONFIG_IEEE1394 is not set ## ## file: drivers/infiniband/Kconfig