From a4b948c9032e9bc4e6341ce2e9cbc5a7851fa914 Mon Sep 17 00:00:00 2001 From: Maximilian Attems Date: Thu, 24 May 2007 17:45:56 +0000 Subject: [PATCH] sort the surpported dvb usb adapters and enable the missing ones. svn path=/dists/trunk/linux-2.6/; revision=8757 --- debian/arch/config | 42 ++++++++++++++++++++++++++---------------- debian/changelog | 5 +++-- 2 files changed, 29 insertions(+), 18 deletions(-) diff --git a/debian/arch/config b/debian/arch/config index 90dd38121..571dcbab9 100644 --- a/debian/arch/config +++ b/debian/arch/config @@ -244,17 +244,13 @@ CONFIG_TCG_ATMEL=m CONFIG_TCG_NSC=m # CONFIG_IP_ROUTE_MULTIPATH_CACHED is not set CONFIG_6PACK=m -CONFIG_DVB_USB_DTT200U=m -CONFIG_DVB_USB_DIGITV=m CONFIG_SERIAL_8250_ACCENT=m CONFIG_FB_ARC=m CONFIG_FUSION_SPI=m -CONFIG_DVB_USB_CXUSB=m CONFIG_FUSION_FC=m CONFIG_NFSD_V2_ACL=y CONFIG_I2O_EXT_ADAPTEC=y CONFIG_USB_CXACRU=m -CONFIG_DVB_USB_A800=m CONFIG_BLK_DEV_IT821X=m # CONFIG_BLK_DEV_JMICRON is not set CONFIG_DRM_VIA=m @@ -269,10 +265,7 @@ CONFIG_SERIAL_8250_MCA=m CONFIG_I2O_BUS=m CONFIG_NET_EMATCH_TEXT=m CONFIG_SERIAL_8250_BOCA=m -CONFIG_DVB_USB_UMT_010=m CONFIG_DVB_PLUTO2=m -CONFIG_DVB_USB_DIBUSB_MB=m -CONFIG_DVB_USB_DIBUSB_MC=m CONFIG_DVB_BCM3510=m # @@ -417,6 +410,32 @@ CONFIG_VIDEO_USBVISION=m CONFIG_VIDEO_USBVIDEO=m CONFIG_VIDEO_OVCAMCHIP=m CONFIG_USB_ZR364XX=m +CONFIG_DVB_CORE_ATTACH=y + +# +# Supported USB Adapters +# +CONFIG_DVB_USB=m +# CONFIG_DVB_USB_DEBUG is not set +CONFIG_DVB_USB_A800=m +CONFIG_DVB_USB_DIBUSB_MB=m +CONFIG_DVB_USB_DIBUSB_MB_FAULTY=y +CONFIG_DVB_USB_DIBUSB_MC=m +CONFIG_DVB_USB_DIB0700=m +CONFIG_DVB_USB_UMT_010=m +CONFIG_DVB_USB_CXUSB=m +CONFIG_DVB_USB_M920X=m +CONFIG_DVB_USB_GL861=m +CONFIG_DVB_USB_AU6610=m +CONFIG_DVB_USB_DIGITV=m +CONFIG_DVB_USB_VP7045=m +CONFIG_DVB_USB_VP702X=m +CONFIG_DVB_USB_GP8PSK=m +CONFIG_DVB_USB_NOVA_T_USB2=m +CONFIG_DVB_USB_TTUSB2=m +CONFIG_DVB_USB_DTT200U=m +CONFIG_DVB_USB_OPERA1=m + # # InfiniBand support @@ -442,15 +461,11 @@ CONFIG_INFINIBAND_ISER=m CONFIG_MTD_PLATRAM=m CONFIG_USB_XUSBATM=m CONFIG_PCMCIA_LOAD_CIS=y -CONFIG_DVB_USB=m CONFIG_USB_LD=m CONFIG_SERIAL_8250_FOURPORT=m -CONFIG_DVB_USB_VP7045=m CONFIG_NFS_ACL_SUPPORT=m CONFIG_PCMCIA_IOCTL=y CONFIG_TCG_INFINEON=m -CONFIG_DVB_USB_NOVA_T_USB2=m -# CONFIG_DVB_USB_DEBUG is not set CONFIG_REISERFS_FS=m # CONFIG_REISERFS_CHECK is not set # CONFIG_REISERFS_PROC_INFO is not set @@ -830,7 +845,6 @@ CONFIG_SIS190=m CONFIG_SND_AD1889=m CONFIG_INET_TCP_DIAG=m CONFIG_USB_NET_CDCETHER=m -CONFIG_DVB_USB_VP702X=m # CONFIG_IEEE80211_DEBUG is not set CONFIG_DAVICOM_PHY=m CONFIG_USB_SISUSBVGA_CON=y @@ -970,7 +984,6 @@ CONFIG_CONFIGFS_FS=m CONFIG_USB_STORAGE_ALAUDA=y CONFIG_NETFILTER_XT_MATCH_MARK=m CONFIG_YENTA_TI=y -CONFIG_DVB_USB_DIBUSB_MB_FAULTY=y CONFIG_NETFILTER_XT_MATCH_STATE=m # CONFIG_SLOB is not set CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m @@ -1102,7 +1115,6 @@ CONFIG_JFFS2_FS_POSIX_ACL=y CONFIG_RTC_DRV_DS1553=m CONFIG_PC8736x_GPIO=m CONFIG_LOCKDEP_SUPPORT=y -CONFIG_DVB_USB_GP8PSK=m CONFIG_NSC_GPIO=m # CONFIG_SECURITY_SELINUX_ENABLE_SECMARK_DEFAULT is not set CONFIG_SND_INDIGO=m @@ -1341,7 +1353,6 @@ CONFIG_DVB_CORE_ATTACH=y CONFIG_ATA_GENERIC=m # CONFIG_SECURITY_SELINUX_POLICYDB_VERSION_MAX is not set CONFIG_NETFILTER_XT_MATCH_DSCP=m -CONFIG_DVB_USB_DIB0700=m # CONFIG_DEFAULT_WESTWOOD is not set CONFIG_USB_USBNET_MII=m # CONFIG_IP_DCCP_CCID2_DEBUG is not set @@ -1387,7 +1398,6 @@ CONFIG_NF_NAT_NEEDED=y CONFIG_NF_NAT_IRC=m CONFIG_IP_DCCP_CCID3_RTO=100 CONFIG_MTD_BLKDEVS=m -CONFIG_DVB_USB_TTUSB2=m CONFIG_BROADCOM_PHY=m CONFIG_NF_NAT_FTP=m CONFIG_NF_NAT_SNMP_BASIC=m diff --git a/debian/changelog b/debian/changelog index 43f096d9b..201946259 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,7 +8,8 @@ linux-2.6 (2.6.22~rc2-1~experimental.1) UNRELEASED; urgency=low * Cleanup configs of old unused variables. * Enable TCP_CONG_YEAH, TCP_CONG_ILLINOIS, NF_CONNTRACK_SANE, DM_DELAY, GIGASET_M101, SATA_INIC162X, VIDEO_IVTV, USB_ZR364XX, INFINIBAND_CXGB3, - MLX4_INFINIBAND, SPI_AT25, MFD_SM501 and disable SCSI_ESP_CORE, SPI_SPIDEV + MLX4_INFINIBAND, SPI_AT25, MFD_SM501, DVB_USB_M920X, DVB_USB_GL861, + DVB_USB_AU6610, DVB_USB_OPERA1 and disable SCSI_ESP_CORE, SPI_SPIDEV in topconfig. * [amd64, i386]: Take care of the renaming acpi-ibm to thinkpad-acpi. Enable KINGSUN_DONGLE, AF_RXRPC, RXKAD, MTD_NAND_PLATFORM, BLINK, PHANTOM. @@ -28,7 +29,7 @@ linux-2.6 (2.6.22~rc2-1~experimental.1) UNRELEASED; urgency=low [ dann frazier ] * Add Xen licensing info to the copyright file. (closes: #368912) - -- maximilian attems Thu, 24 May 2007 19:19:12 +0200 + -- maximilian attems Thu, 24 May 2007 19:46:18 +0200 linux-2.6 (2.6.21-3) UNRELEASED; urgency=low