From 708d1f95772581715405d74d652dc3cd5201072b Mon Sep 17 00:00:00 2001 From: Maximilian Attems Date: Wed, 6 Jun 2007 10:31:56 +0000 Subject: [PATCH] * enable the juju firewire stack "implementation designed for roboustness and simplicity" disable the old firewire stack and associated options let's see if someone cries for ieee1394_eth1394 * centralize firewire settings * disable firewire on configs that disabled IEEE1394 yuhu that gets amd64 down to zero unkown config variables. :) svn path=/dists/trunk/linux-2.6/; revision=8915 --- debian/arch/alpha/config | 15 ------------- debian/arch/amd64/config | 13 ----------- debian/arch/arm/config.footbridge | 16 +------------- debian/arch/arm/config.iop32x | 2 +- debian/arch/arm/config.ixp4xx | 2 +- debian/arch/arm/config.versatile | 2 +- debian/arch/config | 8 +++++++ debian/arch/hppa/config | 2 +- debian/arch/i386/config | 13 ----------- debian/arch/m68k/config.amiga | 2 +- debian/arch/m68k/config.bvme6000 | 2 +- debian/arch/m68k/config.mvme16x | 2 +- debian/arch/mips/config.4kc-malta | 28 ------------------------ debian/arch/mips/config.r5k-ip32 | 2 +- debian/arch/mips/config.sb1-bcm91250a | 2 +- debian/arch/mips/config.sb1a-bcm91480b | 2 +- debian/arch/mipsel/config.4kc-malta | 28 ------------------------ debian/arch/mipsel/config.r5k-cobalt | 2 +- debian/arch/mipsel/config.sb1-bcm91250a | 2 +- debian/arch/mipsel/config.sb1a-bcm91480b | 2 +- debian/arch/powerpc/config | 15 ------------- debian/arch/sparc/config.sparc32 | 2 +- debian/arch/sparc/config.sparc64 | 13 ----------- debian/arch/sparc/config.sparc64-smp | 13 ----------- debian/changelog | 3 ++- 25 files changed, 25 insertions(+), 168 deletions(-) diff --git a/debian/arch/alpha/config b/debian/arch/alpha/config index e25088deb..642381e71 100644 --- a/debian/arch/alpha/config +++ b/debian/arch/alpha/config @@ -300,21 +300,6 @@ CONFIG_SJCD=m CONFIG_ISP16_CDI=m CONFIG_CDU535=m CONFIG_DM_MULTIPATH_EMC=m -CONFIG_IEEE1394=m -# CONFIG_IEEE1394_VERBOSEDEBUG is not set -# CONFIG_IEEE1394_OUI_DB is not set -CONFIG_IEEE1394_EXTRA_CONFIG_ROMS=y -CONFIG_IEEE1394_CONFIG_ROM_IP1394=y -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 -CONFIG_IEEE1394_CMP=m -CONFIG_IEEE1394_AMDTP=m CONFIG_I2O=m CONFIG_I2O_CONFIG=m CONFIG_I2O_BLOCK=m diff --git a/debian/arch/amd64/config b/debian/arch/amd64/config index ad8979749..542cc4e00 100644 --- a/debian/arch/amd64/config +++ b/debian/arch/amd64/config @@ -311,19 +311,6 @@ CONFIG_PCMCIA_FDOMAIN=m CONFIG_PCMCIA_QLOGIC=m CONFIG_PCMCIA_SYM53C500=m CONFIG_DM_MULTIPATH_EMC=m -CONFIG_IEEE1394=m -# CONFIG_IEEE1394_VERBOSEDEBUG is not set -CONFIG_IEEE1394_OUI_DB=y -CONFIG_IEEE1394_EXTRA_CONFIG_ROMS=y -CONFIG_IEEE1394_CONFIG_ROM_IP1394=y -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 CONFIG_I2O=m CONFIG_I2O_CONFIG=m CONFIG_I2O_BLOCK=m diff --git a/debian/arch/arm/config.footbridge b/debian/arch/arm/config.footbridge index 0bee0c022..c3412b7ec 100644 --- a/debian/arch/arm/config.footbridge +++ b/debian/arch/arm/config.footbridge @@ -564,7 +564,7 @@ CONFIG_FUSION_CTL=m # # IEEE 1394 (FireWire) support # -# CONFIG_IEEE1394 is not set +# CONFIG_FIREWIRE is not set # # I2O device support @@ -1676,11 +1676,9 @@ CONFIG_BT_HCIBFUSB=m CONFIG_PCMCIA_3C589=m CONFIG_PCMCIA_WAVELAN=m # CONFIG_VIDEO_ZR36120 is not set -CONFIG_IEEE1394_ETH1394=m # CONFIG_INFTL is not set CONFIG_WAVELAN=m # CONFIG_PCMCIA_SYM53C500 is not set -CONFIG_IEEE1394_EXTRA_CONFIG_ROMS=y # CONFIG_HUGETLBFS is not set CONFIG_TCIC=m CONFIG_BLK_DEV_TRIFLEX=m @@ -1691,7 +1689,6 @@ CONFIG_BT_BNEP_PROTO_FILTER=y # CONFIG_SCSI_CPQFCTS is not set # CONFIG_NCPFS_NFS_NS is not set CONFIG_PCMCIA_AXNET=m -CONFIG_IEEE1394_PCILYNX=m # CONFIG_CDROM_PKTCDVD_WCACHE is not set CONFIG_NET_PCMCIA=y CONFIG_BLK_DEV_ALI15X3=m @@ -1713,7 +1710,6 @@ CONFIG_PCI_HERMES=m CONFIG_CARDBUS=y # CONFIG_BLK_DEV_HT6560B is not set # CONFIG_NFTL is not set -CONFIG_IEEE1394_OHCI1394=m # CONFIG_NCPFS_NLS is not set CONFIG_LLC=m CONFIG_BLK_DEV_CMD64X=m @@ -1731,14 +1727,12 @@ CONFIG_PCMCIA_XIRC2PS=m CONFIG_PCMCIA_NETWAVE=m # CONFIG_SCSI_QLOGIC_ISP is not set # CONFIG_PCMCIA_DEBUG is not set -CONFIG_IEEE1394_VIDEO1394=m CONFIG_BT_HCIBPA10X=m CONFIG_BLK_DEV_CS5520=m CONFIG_USB_SISUSBVGA=m CONFIG_PCMCIA_FMVJ18X=m # CONFIG_SMP is not set # CONFIG_8139_OLD_RX_RESET is not set -CONFIG_IEEE1394_CONFIG_ROM_IP1394=y # CONFIG_IDEDMA_IVB is not set CONFIG_LOGO_LINUX_MONO=y # CONFIG_BLK_DEV_ALI14XX is not set @@ -1747,7 +1741,6 @@ CONFIG_BLK_DEV_CS5530=m # CONFIG_FTL is not set CONFIG_I82092=m # CONFIG_8139TOO_8129 is not set -# CONFIG_IEEE1394_SBP2_PHYS_DMA is not set CONFIG_YENTA=m CONFIG_CDROM_PKTCDVD_BUFFERS=8 # CONFIG_NCPFS_EXTRAS is not set @@ -1763,17 +1756,13 @@ CONFIG_BLK_DEV_TRM290=m # CONFIG_USB_SL811_CS is not set CONFIG_HERMES=m CONFIG_BLK_DEV_IDEDMA_PCI=y -CONFIG_IEEE1394_CMP=m -CONFIG_IEEE1394_SBP2=m # CONFIG_PCMCIA_FDOMAIN is not set CONFIG_BLK_DEV_OPTI621=m CONFIG_BT_HCIBCM203X=m -CONFIG_IEEE1394_DV1394=m CONFIG_PCMCIA_NMCLAN=m CONFIG_BLK_DEV_PIIX=m CONFIG_BLK_DEV_GENERIC=m CONFIG_BT_HCIDTL1=m -# CONFIG_IEEE1394_OUI_DB is not set CONFIG_BT_HCIUSB=m # CONFIG_NCPFS_OS2_NS is not set # CONFIG_BLK_DEV_IDECS is not set @@ -1802,13 +1791,10 @@ CONFIG_BLK_DEV_HPT34X=m CONFIG_BT_SCO=m CONFIG_BT_HCIUSB_SCO=y CONFIG_BT_HCIUART_BCSP=y -CONFIG_IEEE1394_RAWIO=m # CONFIG_DECNET_ROUTER is not set CONFIG_BLK_DEV_SC1200=m # CONFIG_R8169_VLAN is not set -# CONFIG_IEEE1394_VERBOSEDEBUG is not set # CONFIG_PCMCIA_NINJA_SCSI is not set -# CONFIG_IEEE1394_AMDTP is not set CONFIG_BLK_DEV_PDC202XX_OLD=m # CONFIG_LANCE is not set CONFIG_VIDEO_TVEEPROM=m diff --git a/debian/arch/arm/config.iop32x b/debian/arch/arm/config.iop32x index 505db217d..f33da7c7d 100644 --- a/debian/arch/arm/config.iop32x +++ b/debian/arch/arm/config.iop32x @@ -766,7 +766,7 @@ CONFIG_FUSION_CTL=m # # IEEE 1394 (FireWire) support # -# CONFIG_IEEE1394 is not set +# CONFIG_FIREWIRE is not set # # I2O device support diff --git a/debian/arch/arm/config.ixp4xx b/debian/arch/arm/config.ixp4xx index 96ffb3a62..b022b1e11 100644 --- a/debian/arch/arm/config.ixp4xx +++ b/debian/arch/arm/config.ixp4xx @@ -747,7 +747,7 @@ CONFIG_FUSION_CTL=m # # IEEE 1394 (FireWire) support # -# CONFIG_IEEE1394 is not set +# CONFIG_FIREWIRE is not set # # I2O device support diff --git a/debian/arch/arm/config.versatile b/debian/arch/arm/config.versatile index d7a33ca86..7098e545a 100644 --- a/debian/arch/arm/config.versatile +++ b/debian/arch/arm/config.versatile @@ -668,7 +668,7 @@ CONFIG_DM_MULTIPATH=m # # IEEE 1394 (FireWire) support # -# CONFIG_IEEE1394 is not set +# CONFIG_FIREWIRE is not set # # I2O device support diff --git a/debian/arch/config b/debian/arch/config index a543d37e3..3c5d80895 100644 --- a/debian/arch/config +++ b/debian/arch/config @@ -519,6 +519,14 @@ CONFIG_FUSION_SAS=m CONFIG_FUSION_MAX_SGE=40 CONFIG_FUSION_CTL=m +# +# IEEE 1394 (FireWire) support +# +CONFIG_FIREWIRE=m +CONFIG_FIREWIRE_OHCI=m +CONFIG_FIREWIRE_SBP2=m +# CONFIG_IEEE1394 is not set + # # USB Serial Converter support # diff --git a/debian/arch/hppa/config b/debian/arch/hppa/config index dd9ca2b70..76b10438e 100644 --- a/debian/arch/hppa/config +++ b/debian/arch/hppa/config @@ -190,7 +190,7 @@ CONFIG_PCMCIA_SYM53C500=m # CONFIG_CD_NO_IDESCSI is not set CONFIG_MD=y CONFIG_DM_MULTIPATH_EMC=m -# CONFIG_IEEE1394 is not set +# CONFIG_FIREWIRE is not set CONFIG_I2O=m CONFIG_I2O_CONFIG=m CONFIG_I2O_BLOCK=m diff --git a/debian/arch/i386/config b/debian/arch/i386/config index 3ce1aa503..5b04c59df 100644 --- a/debian/arch/i386/config +++ b/debian/arch/i386/config @@ -409,19 +409,6 @@ CONFIG_SJCD=m CONFIG_ISP16_CDI=m CONFIG_CDU535=m CONFIG_DM_MULTIPATH_EMC=m -CONFIG_IEEE1394=m -# CONFIG_IEEE1394_VERBOSEDEBUG is not set -# CONFIG_IEEE1394_OUI_DB is not set -CONFIG_IEEE1394_EXTRA_CONFIG_ROMS=y -CONFIG_IEEE1394_CONFIG_ROM_IP1394=y -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 CONFIG_I2O=m CONFIG_I2O_CONFIG=m CONFIG_I2O_BLOCK=m diff --git a/debian/arch/m68k/config.amiga b/debian/arch/m68k/config.amiga index aa548b5ac..26bba6657 100644 --- a/debian/arch/m68k/config.amiga +++ b/debian/arch/m68k/config.amiga @@ -72,7 +72,7 @@ CONFIG_SCSI_AMIGA7XX=y # CONFIG_OKTAGON_SCSI is not set # CONFIG_SCSI_NCR53C7xx_FAST is not set # CONFIG_CD_NO_IDESCSI is not set -# CONFIG_IEEE1394 is not set +# CONFIG_FIREWIRE is not set # CONFIG_IP_PNP is not set CONFIG_IPX=m # CONFIG_IPX_INTERN is not set diff --git a/debian/arch/m68k/config.bvme6000 b/debian/arch/m68k/config.bvme6000 index 5967edd75..4aaedf516 100644 --- a/debian/arch/m68k/config.bvme6000 +++ b/debian/arch/m68k/config.bvme6000 @@ -20,7 +20,7 @@ CONFIG_MMU_MOTOROLA=y # CONFIG_IDE is not set CONFIG_BVME6000_SCSI=y # CONFIG_SCSI_NCR53C7xx_FAST is not set -# CONFIG_IEEE1394 is not set +# CONFIG_FIREWIRE is not set CONFIG_IP_PNP=y CONFIG_IP_PNP_DHCP=y CONFIG_IP_PNP_BOOTP=y diff --git a/debian/arch/m68k/config.mvme16x b/debian/arch/m68k/config.mvme16x index 3634a6c08..56cefcb43 100644 --- a/debian/arch/m68k/config.mvme16x +++ b/debian/arch/m68k/config.mvme16x @@ -20,7 +20,7 @@ CONFIG_MMU_MOTOROLA=y # CONFIG_IDE is not set CONFIG_MVME16x_SCSI=y # CONFIG_SCSI_NCR53C7xx_FAST is not set -# CONFIG_IEEE1394 is not set +# CONFIG_FIREWIRE is not set CONFIG_IP_PNP=y CONFIG_IP_PNP_DHCP=y CONFIG_IP_PNP_BOOTP=y diff --git a/debian/arch/mips/config.4kc-malta b/debian/arch/mips/config.4kc-malta index d1377b17c..ffa1d1ac5 100644 --- a/debian/arch/mips/config.4kc-malta +++ b/debian/arch/mips/config.4kc-malta @@ -1185,34 +1185,6 @@ CONFIG_DM_ZERO=m CONFIG_DM_MULTIPATH=m CONFIG_DM_MULTIPATH_EMC=m -# -# IEEE 1394 (FireWire) support -# -CONFIG_IEEE1394=m - -# -# Subsystem Options -# -# CONFIG_IEEE1394_VERBOSEDEBUG is not set -CONFIG_IEEE1394_OUI_DB=y -CONFIG_IEEE1394_EXTRA_CONFIG_ROMS=y -CONFIG_IEEE1394_CONFIG_ROM_IP1394=y - -# -# Device Drivers -# -CONFIG_IEEE1394_PCILYNX=m -CONFIG_IEEE1394_OHCI1394=m - -# -# Protocol Drivers -# -CONFIG_IEEE1394_VIDEO1394=m -CONFIG_IEEE1394_SBP2=m -CONFIG_IEEE1394_ETH1394=m -CONFIG_IEEE1394_DV1394=m -CONFIG_IEEE1394_RAWIO=m - # # I2O device support # diff --git a/debian/arch/mips/config.r5k-ip32 b/debian/arch/mips/config.r5k-ip32 index c9900222f..126df34ed 100644 --- a/debian/arch/mips/config.r5k-ip32 +++ b/debian/arch/mips/config.r5k-ip32 @@ -589,7 +589,7 @@ CONFIG_DM_MULTIPATH=m # # IEEE 1394 (FireWire) support # -# CONFIG_IEEE1394 is not set +# CONFIG_FIREWIRE is not set # # I2O device support diff --git a/debian/arch/mips/config.sb1-bcm91250a b/debian/arch/mips/config.sb1-bcm91250a index 8e29033a5..376a43e72 100644 --- a/debian/arch/mips/config.sb1-bcm91250a +++ b/debian/arch/mips/config.sb1-bcm91250a @@ -687,7 +687,7 @@ CONFIG_DM_MULTIPATH=m # # IEEE 1394 (FireWire) support # -# CONFIG_IEEE1394 is not set +# CONFIG_FIREWIRE is not set # # I2O device support diff --git a/debian/arch/mips/config.sb1a-bcm91480b b/debian/arch/mips/config.sb1a-bcm91480b index 515ad73f8..1717ab913 100644 --- a/debian/arch/mips/config.sb1a-bcm91480b +++ b/debian/arch/mips/config.sb1a-bcm91480b @@ -683,7 +683,7 @@ CONFIG_DM_MULTIPATH=m # # IEEE 1394 (FireWire) support # -# CONFIG_IEEE1394 is not set +# CONFIG_FIREWIRE is not set # # I2O device support diff --git a/debian/arch/mipsel/config.4kc-malta b/debian/arch/mipsel/config.4kc-malta index de85e6609..434ce0fdc 100644 --- a/debian/arch/mipsel/config.4kc-malta +++ b/debian/arch/mipsel/config.4kc-malta @@ -1186,34 +1186,6 @@ CONFIG_DM_ZERO=m CONFIG_DM_MULTIPATH=m CONFIG_DM_MULTIPATH_EMC=m -# -# IEEE 1394 (FireWire) support -# -CONFIG_IEEE1394=m - -# -# Subsystem Options -# -# CONFIG_IEEE1394_VERBOSEDEBUG is not set -CONFIG_IEEE1394_OUI_DB=y -CONFIG_IEEE1394_EXTRA_CONFIG_ROMS=y -CONFIG_IEEE1394_CONFIG_ROM_IP1394=y - -# -# Device Drivers -# -CONFIG_IEEE1394_PCILYNX=m -CONFIG_IEEE1394_OHCI1394=m - -# -# Protocol Drivers -# -CONFIG_IEEE1394_VIDEO1394=m -CONFIG_IEEE1394_SBP2=m -CONFIG_IEEE1394_ETH1394=m -CONFIG_IEEE1394_DV1394=m -CONFIG_IEEE1394_RAWIO=m - # # I2O device support # diff --git a/debian/arch/mipsel/config.r5k-cobalt b/debian/arch/mipsel/config.r5k-cobalt index 1eadef39f..6ef9d33bc 100644 --- a/debian/arch/mipsel/config.r5k-cobalt +++ b/debian/arch/mipsel/config.r5k-cobalt @@ -644,7 +644,7 @@ CONFIG_DM_MULTIPATH=m # # IEEE 1394 (FireWire) support # -# CONFIG_IEEE1394 is not set +# CONFIG_FIREWIRE is not set # # I2O device support diff --git a/debian/arch/mipsel/config.sb1-bcm91250a b/debian/arch/mipsel/config.sb1-bcm91250a index 0932db673..d6dbf25db 100644 --- a/debian/arch/mipsel/config.sb1-bcm91250a +++ b/debian/arch/mipsel/config.sb1-bcm91250a @@ -687,7 +687,7 @@ CONFIG_DM_MULTIPATH=m # # IEEE 1394 (FireWire) support # -# CONFIG_IEEE1394 is not set +# CONFIG_FIREWIRE is not set # # I2O device support diff --git a/debian/arch/mipsel/config.sb1a-bcm91480b b/debian/arch/mipsel/config.sb1a-bcm91480b index ca3ec407f..9a6892ad5 100644 --- a/debian/arch/mipsel/config.sb1a-bcm91480b +++ b/debian/arch/mipsel/config.sb1a-bcm91480b @@ -683,7 +683,7 @@ CONFIG_DM_MULTIPATH=m # # IEEE 1394 (FireWire) support # -# CONFIG_IEEE1394 is not set +# CONFIG_FIREWIRE is not set # # I2O device support diff --git a/debian/arch/powerpc/config b/debian/arch/powerpc/config index fbb6a0dd3..da6ab73d1 100644 --- a/debian/arch/powerpc/config +++ b/debian/arch/powerpc/config @@ -188,21 +188,6 @@ CONFIG_PCMCIA_NINJA_SCSI=m CONFIG_PCMCIA_QLOGIC=m CONFIG_PCMCIA_SYM53C500=m CONFIG_DM_MULTIPATH_EMC=m -CONFIG_IEEE1394=m -# CONFIG_IEEE1394_VERBOSEDEBUG is not set -CONFIG_IEEE1394_OUI_DB=y -CONFIG_IEEE1394_EXTRA_CONFIG_ROMS=y -CONFIG_IEEE1394_CONFIG_ROM_IP1394=y -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 -CONFIG_IEEE1394_CMP=m -CONFIG_IEEE1394_AMDTP=m CONFIG_I2O=m CONFIG_I2O_CONFIG=m CONFIG_I2O_BLOCK=m diff --git a/debian/arch/sparc/config.sparc32 b/debian/arch/sparc/config.sparc32 index 3075147d8..023fd21b5 100644 --- a/debian/arch/sparc/config.sparc32 +++ b/debian/arch/sparc/config.sparc32 @@ -77,7 +77,7 @@ CONFIG_BLK_DEV_LOOP=m # CONFIG_SERIAL_SUNSU is not set # CONFIG_SCSI_DMX3191D is not set # CONFIG_SMP is not set -# CONFIG_IEEE1394 is not set +# CONFIG_FIREWIRE is not set # CONFIG_HWMON_VID is not set CONFIG_FB_BW2=y # CONFIG_NTFS_FS is not set diff --git a/debian/arch/sparc/config.sparc64 b/debian/arch/sparc/config.sparc64 index 110dba91b..e2660b1d1 100644 --- a/debian/arch/sparc/config.sparc64 +++ b/debian/arch/sparc/config.sparc64 @@ -11,9 +11,7 @@ CONFIG_I2C_PARPORT_LIGHT=m CONFIG_USB_OHCI_LITTLE_ENDIAN=y CONFIG_DRM_TDFX=m # CONFIG_EEPRO100 is not set -CONFIG_IEEE1394_DV1394=m CONFIG_FDDI=y -CONFIG_IEEE1394_VIDEO1394=m CONFIG_USB_EHCI_HCD=m CONFIG_SERIAL_SUNSAB=y CONFIG_NET_TULIP=y @@ -29,7 +27,6 @@ CONFIG_NET_TULIP=y # CONFIG_LOGO_LINUX_CLUT224 is not set # CONFIG_SENSORS_MAX1619 is not set # Fibre Channel support -# CONFIG_IEEE1394_VERBOSEDEBUG is not set CONFIG_DISPLAY7SEG=m CONFIG_USB_UHCI_HCD=m CONFIG_USB_SERIAL=m @@ -76,7 +73,6 @@ CONFIG_USB_KAWETH=m CONFIG_WINBOND_840=m CONFIG_ADAPTEC_STARFIRE=m # CONFIG_FB_BW2 is not set -CONFIG_IEEE1394_EXTRA_CONFIG_ROMS=y # CONFIG_BLK_DEV_UB is not set CONFIG_FC4_SOC=m CONFIG_USB_CYTHERM=m @@ -121,9 +117,7 @@ CONFIG_DRM_RADEON=m CONFIG_BLK_DEV_RAM_SIZE=16384 # USB Serial Converter support # CONFIG_CDROM_PKTCDVD_WCACHE is not set -CONFIG_IEEE1394_RAWIO=m # CONFIG_SENSORS_ADM1026 is not set -CONFIG_IEEE1394_OHCI1394=m CONFIG_STANDALONE=y CONFIG_USB_RIO500=m CONFIG_USB_BELKIN=y @@ -151,7 +145,6 @@ CONFIG_MEGARAID_NEWGEN=y CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16 CONFIG_VIDEO_BUF=m # CONFIG_VIDEO_SAA5246A is not set -CONFIG_IEEE1394_SBP2=m CONFIG_I2C_ISA=m # CONFIG_I2C_VOODOO3 is not set CONFIG_BLK_DEV_NS87415=m @@ -234,7 +227,6 @@ CONFIG_SPARC64_PAGE_SIZE_8KB=y # CONFIG_AMD8111_ETH is not set CONFIG_BLK_DEV_SVWKS=m # CONFIG_SENSORS_SMSC47M1 is not set -CONFIG_IEEE1394_OUI_DB=y # CONFIG_IDEDMA_IVB is not set # CONFIG_PDC202XX_BURST is not set # CONFIG_SENSORS_ASB100 is not set @@ -261,7 +253,6 @@ CONFIG_MEGARAID_LEGACY=m # CONFIG_SENSORS_LM85 is not set # CONFIG_USB_DYNAMIC_MINORS is not set # CONFIG_BLK_DEV_OFFBOARD is not set -CONFIG_IEEE1394_CONFIG_ROM_IP1394=y CONFIG_EPIC100=m # CONFIG_I2C_PCA_ISA is not set CONFIG_USB_ALI_M5632=y @@ -281,7 +272,6 @@ CONFIG_TIGON3=m CONFIG_IDE_GENERIC=m CONFIG_SKFP=m # CONFIG_USB_W9968CF is not set -CONFIG_IEEE1394=m # FC4 drivers # V4L USB devices CONFIG_VORTEX=m @@ -344,7 +334,6 @@ CONFIG_ARCH_SPARSEMEM_DEFAULT=y # CONFIG_USB_STV680 is not set # CONFIG_I2C_SIS5595 is not set # CONFIG_SND_USB_AUDIO is not set -# CONFIG_IEEE1394_SBP2_PHYS_DMA is not set CONFIG_USB_PRINTER=m CONFIG_DRM=y CONFIG_BLK_DEV_IDEDMA_PCI=y @@ -380,10 +369,8 @@ CONFIG_SPARSEMEM_EXTREME=y # CONFIG_SENSORS_PC87360 is not set # CONFIG_FB_RADEON_I2C is not set CONFIG_E100=m -CONFIG_IEEE1394_PCILYNX=m # Protocol Drivers CONFIG_VIDEO_IR=m -CONFIG_IEEE1394_ETH1394=m CONFIG_SIS900=m # CONFIG_USB_STORAGE_DATAFAB is not set CONFIG_NET_PCI=y diff --git a/debian/arch/sparc/config.sparc64-smp b/debian/arch/sparc/config.sparc64-smp index 47e4df99f..860ab16a3 100644 --- a/debian/arch/sparc/config.sparc64-smp +++ b/debian/arch/sparc/config.sparc64-smp @@ -11,9 +11,7 @@ CONFIG_I2C_PARPORT_LIGHT=m CONFIG_USB_OHCI_LITTLE_ENDIAN=y CONFIG_DRM_TDFX=m # CONFIG_EEPRO100 is not set -CONFIG_IEEE1394_DV1394=m CONFIG_FDDI=y -CONFIG_IEEE1394_VIDEO1394=m CONFIG_USB_EHCI_HCD=m CONFIG_SERIAL_SUNSAB=y CONFIG_NET_TULIP=y @@ -29,7 +27,6 @@ CONFIG_NET_TULIP=y # CONFIG_LOGO_LINUX_CLUT224 is not set # CONFIG_SENSORS_MAX1619 is not set # Fibre Channel support -# CONFIG_IEEE1394_VERBOSEDEBUG is not set CONFIG_DISPLAY7SEG=m CONFIG_USB_UHCI_HCD=m # CONFIG_USB_SERIAL is not set @@ -77,7 +74,6 @@ CONFIG_USB_KAWETH=m CONFIG_WINBOND_840=m CONFIG_ADAPTEC_STARFIRE=m # CONFIG_FB_BW2 is not set -CONFIG_IEEE1394_EXTRA_CONFIG_ROMS=y # CONFIG_BLK_DEV_UB is not set CONFIG_FC4_SOC=m CONFIG_USB_CYTHERM=m @@ -122,9 +118,7 @@ CONFIG_DRM_RADEON=m CONFIG_BLK_DEV_RAM_SIZE=16384 CONFIG_I2C_PARPORT=m # CONFIG_CDROM_PKTCDVD_WCACHE is not set -CONFIG_IEEE1394_RAWIO=m # CONFIG_SENSORS_ADM1026 is not set -CONFIG_IEEE1394_OHCI1394=m CONFIG_STANDALONE=y CONFIG_USB_RIO500=m CONFIG_USB_BELKIN=y @@ -151,7 +145,6 @@ CONFIG_MEGARAID_NEWGEN=y CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16 CONFIG_VIDEO_BUF=m # CONFIG_VIDEO_SAA5246A is not set -CONFIG_IEEE1394_SBP2=m CONFIG_I2C_ISA=m # CONFIG_I2C_VOODOO3 is not set CONFIG_BLK_DEV_NS87415=m @@ -233,7 +226,6 @@ CONFIG_SPARC64_PAGE_SIZE_8KB=y # CONFIG_AMD8111_ETH is not set CONFIG_BLK_DEV_SVWKS=m # CONFIG_SENSORS_SMSC47M1 is not set -CONFIG_IEEE1394_OUI_DB=y # CONFIG_IDEDMA_IVB is not set # CONFIG_PDC202XX_BURST is not set # CONFIG_SENSORS_ASB100 is not set @@ -261,7 +253,6 @@ CONFIG_MEGARAID_LEGACY=m # CONFIG_IDE_ARM is not set # CONFIG_USB_DYNAMIC_MINORS is not set # CONFIG_BLK_DEV_OFFBOARD is not set -CONFIG_IEEE1394_CONFIG_ROM_IP1394=y CONFIG_EPIC100=m CONFIG_LOG_BUF_SHIFT=15 # CONFIG_I2C_PCA_ISA is not set @@ -283,7 +274,6 @@ CONFIG_USB_LCD=m # Sat Sep 16 21:14:07 2006 CONFIG_SKFP=m # CONFIG_USB_W9968CF is not set -CONFIG_IEEE1394=m # FC4 drivers # V4L USB devices CONFIG_VORTEX=m @@ -346,7 +336,6 @@ CONFIG_ARCH_SPARSEMEM_DEFAULT=y # CONFIG_USB_STV680 is not set # CONFIG_I2C_SIS5595 is not set # CONFIG_SND_USB_AUDIO is not set -# CONFIG_IEEE1394_SBP2_PHYS_DMA is not set CONFIG_USB_PRINTER=m CONFIG_DRM=y CONFIG_BLK_DEV_IDEDMA_PCI=y @@ -383,10 +372,8 @@ CONFIG_SPARSEMEM_EXTREME=y # CONFIG_SENSORS_PC87360 is not set # CONFIG_FB_RADEON_I2C is not set CONFIG_SCSI_DC395x=m -CONFIG_IEEE1394_PCILYNX=m # Protocol Drivers CONFIG_VIDEO_IR=m -CONFIG_IEEE1394_ETH1394=m CONFIG_SIS900=m # CONFIG_USB_STORAGE_DATAFAB is not set CONFIG_NET_PCI=y diff --git a/debian/changelog b/debian/changelog index 40aadfee0..9ba5a6024 100644 --- a/debian/changelog +++ b/debian/changelog @@ -31,6 +31,7 @@ linux-2.6 (2.6.22~rc4-1~experimental.1) UNRELEASED; urgency=low * [amd64] Enable KS0108 LCD controller. * Enable the preemption of the big kernel lock. Low hanging fruit for better latency with excellent debug info in smp_processor_id(). + * Enable the new firewire stack labeled to be more simple and robust. [ Martin Michlmayr ] * mipsel/r5k-cobalt: Use the new RTC system. @@ -43,7 +44,7 @@ linux-2.6 (2.6.22~rc4-1~experimental.1) UNRELEASED; urgency=low * arm: Mark CHELSIO_T3, NETXEN_NIC, BCM43XX, VIDEO_BT848, DVB_B2C2_FLEXCOP, and DVB_BUDGET as broken on ARM. - -- maximilian attems Wed, 06 Jun 2007 12:03:27 +0200 + -- maximilian attems Wed, 06 Jun 2007 12:25:41 +0200 linux-2.6 (2.6.21-3) UNRELEASED; urgency=low