[kernel] r11470 - in dists/trunk/linux-2.6/debian/config: . alpha amd64 arm hppa i386 ia64 m68k mips mipsel powerpc s390 sparc
Bastian Blank
waldi at alioth.debian.org
Wed May 28 22:03:11 UTC 2008
Author: waldi
Date: Wed May 28 22:03:10 2008
New Revision: 11470
Log:
debian/config: Reorder.
Modified:
dists/trunk/linux-2.6/debian/config/alpha/config
dists/trunk/linux-2.6/debian/config/amd64/config
dists/trunk/linux-2.6/debian/config/arm/config.footbridge
dists/trunk/linux-2.6/debian/config/arm/config.iop32x
dists/trunk/linux-2.6/debian/config/arm/config.ixp4xx
dists/trunk/linux-2.6/debian/config/arm/config.orion5x
dists/trunk/linux-2.6/debian/config/arm/config.versatile
dists/trunk/linux-2.6/debian/config/config
dists/trunk/linux-2.6/debian/config/hppa/config.parisc
dists/trunk/linux-2.6/debian/config/hppa/config.parisc64
dists/trunk/linux-2.6/debian/config/i386/config
dists/trunk/linux-2.6/debian/config/i386/config.486
dists/trunk/linux-2.6/debian/config/i386/config.686
dists/trunk/linux-2.6/debian/config/i386/config.686-bigmem
dists/trunk/linux-2.6/debian/config/ia64/config
dists/trunk/linux-2.6/debian/config/m68k/config.amiga
dists/trunk/linux-2.6/debian/config/mips/config.4kc-malta
dists/trunk/linux-2.6/debian/config/mips/config.5kc-malta
dists/trunk/linux-2.6/debian/config/mips/config.sb1a-bcm91480b
dists/trunk/linux-2.6/debian/config/mipsel/config.4kc-malta
dists/trunk/linux-2.6/debian/config/mipsel/config.5kc-malta
dists/trunk/linux-2.6/debian/config/mipsel/config.sb1-bcm91250a
dists/trunk/linux-2.6/debian/config/mipsel/config.sb1a-bcm91480b
dists/trunk/linux-2.6/debian/config/powerpc/config
dists/trunk/linux-2.6/debian/config/powerpc/config.powerpc
dists/trunk/linux-2.6/debian/config/powerpc/config.powerpc-miboot
dists/trunk/linux-2.6/debian/config/powerpc/config.powerpc64
dists/trunk/linux-2.6/debian/config/s390/config
dists/trunk/linux-2.6/debian/config/sparc/config.sparc64
dists/trunk/linux-2.6/debian/config/sparc/config.sparc64-smp
Modified: dists/trunk/linux-2.6/debian/config/alpha/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/alpha/config (original)
+++ dists/trunk/linux-2.6/debian/config/alpha/config Wed May 28 22:03:10 2008
@@ -590,7 +590,7 @@
CONFIG_ISDN_DRV_SC=m
##
-## file: drivers/media/dvb/dvb-core/Kconfig
+## file: drivers/media/Kconfig
##
CONFIG_DVB_CORE=m
@@ -917,7 +917,6 @@
CONFIG_WINBOND_840=m
CONFIG_DM9102=m
CONFIG_PCMCIA_XIRCOM=m
-CONFIG_PCMCIA_XIRTULIP=m
##
## file: drivers/net/usb/Kconfig
@@ -1308,7 +1307,6 @@
##
# CONFIG_DEBUG_SLAB is not set
# CONFIG_DEBUG_SPINLOCK is not set
-# CONFIG_DEBUG_SEMAPHORE is not set
# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
# CONFIG_DEBUG_KOBJECT is not set
# CONFIG_DEBUG_INFO is not set
@@ -1547,11 +1545,13 @@
## file: unknown
##
# CONFIG_DEBUG_RWLOCK is not set
+# CONFIG_DEBUG_SEMAPHORE is not set
# CONFIG_IP_TCPDIAG is not set
# CONFIG_IP_TCPDIAG_IPV6 is not set
CONFIG_MAD16_OLDCARD=y
CONFIG_MTD_BLKMTD=m
CONFIG_MTD_CFI_AMDSTD_RETRY=0
+CONFIG_PCMCIA_XIRTULIP=m
CONFIG_SCSI_QLOGIC_1280_1040=y
CONFIG_SCSI_QLOGIC_FC=m
CONFIG_SERIAL_8250_MULTIPORT=y
Modified: dists/trunk/linux-2.6/debian/config/amd64/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/amd64/config (original)
+++ dists/trunk/linux-2.6/debian/config/amd64/config Wed May 28 22:03:10 2008
@@ -27,7 +27,6 @@
CONFIG_MICROCODE=m
CONFIG_X86_MSR=m
CONFIG_X86_CPUID=m
-CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y
CONFIG_MTRR=y
CONFIG_EFI=y
# CONFIG_SECCOMP is not set
@@ -65,7 +64,9 @@
# CONFIG_DIRECT_GBPAGES is not set
# CONFIG_DEBUG_NX_TEST is not set
# CONFIG_IOMMU_DEBUG is not set
+## choice: IO delay type
CONFIG_IO_DELAY_0X80=y
+## end choice
# CONFIG_DEBUG_BOOT_PARAMS is not set
# CONFIG_CPA_DEBUG is not set
@@ -90,9 +91,9 @@
##
## file: crypto/Kconfig
##
-CONFIG_CRYPTO_TWOFISH_X86_64=m
CONFIG_CRYPTO_AES_X86_64=m
CONFIG_CRYPTO_SALSA20_X86_64=m
+CONFIG_CRYPTO_TWOFISH_X86_64=m
##
## file: drivers/acpi/Kconfig
@@ -718,7 +719,7 @@
CONFIG_MAC_EMUMOUSEBTN=y
##
-## file: drivers/media/dvb/dvb-core/Kconfig
+## file: drivers/media/Kconfig
##
CONFIG_DVB_CORE=m
@@ -1283,6 +1284,7 @@
##
CONFIG_VIDEO_OUTPUT_CONTROL=m
CONFIG_FB=y
+CONFIG_FB_HECUBA=m
CONFIG_FB_MODE_HELPERS=y
CONFIG_FB_TILEBLITTING=y
CONFIG_FB_CIRRUS=m
@@ -1295,7 +1297,6 @@
CONFIG_FB_VESA=y
CONFIG_FB_EFI=y
# CONFIG_FB_IMAC is not set
-CONFIG_FB_HECUBA=m
CONFIG_FB_N411=m
CONFIG_FB_HGA=m
# CONFIG_FB_HGA_ACCEL is not set
@@ -1484,6 +1485,7 @@
##
## file: mm/Kconfig
##
+CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y
CONFIG_RESOURCES_64BIT=y
##
Modified: dists/trunk/linux-2.6/debian/config/arm/config.footbridge
==============================================================================
--- dists/trunk/linux-2.6/debian/config/arm/config.footbridge (original)
+++ dists/trunk/linux-2.6/debian/config/arm/config.footbridge Wed May 28 22:03:10 2008
@@ -463,9 +463,6 @@
## file: drivers/media/Kconfig
##
CONFIG_VIDEO_DEV=m
-CONFIG_VIDEO_TUNER=m
-CONFIG_VIDEO_IR=m
-CONFIG_VIDEO_TVEEPROM=m
##
## file: drivers/media/radio/Kconfig
@@ -489,6 +486,9 @@
##
## file: drivers/media/video/Kconfig
##
+CONFIG_VIDEO_IR=m
+CONFIG_VIDEO_TVEEPROM=m
+CONFIG_VIDEO_TUNER=m
# CONFIG_VIDEO_PMS is not set
# CONFIG_VIDEO_BWQCAM is not set
# CONFIG_VIDEO_CQCAM is not set
@@ -779,7 +779,6 @@
CONFIG_DM9102=m
CONFIG_ULI526X=m
CONFIG_PCMCIA_XIRCOM=m
-CONFIG_PCMCIA_XIRTULIP=m
##
## file: drivers/net/wan/Kconfig
@@ -1617,6 +1616,7 @@
CONFIG_OBSOLETE_MODPARM=y
CONFIG_OBSOLETE_OSS_DRIVER=y
# CONFIG_PARPORT_ARC is not set
+CONFIG_PCMCIA_XIRTULIP=m
# CONFIG_SCSI_CPQFCTS is not set
# CONFIG_SCSI_QLOGIC_FC is not set
# CONFIG_SCSI_QLOGIC_ISP is not set
Modified: dists/trunk/linux-2.6/debian/config/arm/config.iop32x
==============================================================================
--- dists/trunk/linux-2.6/debian/config/arm/config.iop32x (original)
+++ dists/trunk/linux-2.6/debian/config/arm/config.iop32x Wed May 28 22:03:10 2008
@@ -86,6 +86,7 @@
##
CONFIG_ATA=m
CONFIG_SATA_AHCI=m
+CONFIG_SATA_SIL24=m
CONFIG_SATA_SVW=m
CONFIG_ATA_PIIX=m
CONFIG_SATA_MV=m
@@ -95,7 +96,6 @@
CONFIG_SATA_PROMISE=m
CONFIG_SATA_SX4=m
CONFIG_SATA_SIL=m
-CONFIG_SATA_SIL24=m
CONFIG_SATA_SIS=m
CONFIG_SATA_ULI=m
CONFIG_SATA_VIA=m
@@ -350,7 +350,6 @@
# CONFIG_MOUSE_SERIAL is not set
CONFIG_MOUSE_APPLETOUCH=m
# CONFIG_MOUSE_VSXXXAA is not set
-# CONFIG_PATA_ARTOP is not set
##
## file: drivers/input/serio/Kconfig
@@ -413,11 +412,6 @@
## file: drivers/media/Kconfig
##
CONFIG_VIDEO_DEV=m
-CONFIG_VIDEO_V4L1=y
-
-##
-## file: drivers/media/dvb/dvb-core/Kconfig
-##
CONFIG_DVB_CORE=m
##
@@ -428,6 +422,11 @@
# CONFIG_RADIO_MAESTRO is not set
##
+## file: drivers/media/video/Kconfig
+##
+CONFIG_VIDEO_V4L1=y
+
+##
## file: drivers/message/fusion/Kconfig
##
CONFIG_FUSION=y
Modified: dists/trunk/linux-2.6/debian/config/arm/config.ixp4xx
==============================================================================
--- dists/trunk/linux-2.6/debian/config/arm/config.ixp4xx (original)
+++ dists/trunk/linux-2.6/debian/config/arm/config.ixp4xx Wed May 28 22:03:10 2008
@@ -94,6 +94,11 @@
# CONFIG_CPU_BIG_ENDIAN is not set
##
+## file: drivers/ata/Kconfig
+##
+# CONFIG_ATA is not set
+
+##
## file: drivers/block/Kconfig
##
# CONFIG_BLK_CPQ_DA is not set
@@ -339,10 +344,7 @@
##
## file: drivers/media/Kconfig
##
-CONFIG_VIDEO_TUNER=m
-CONFIG_VIDEO_BTCX=m
-CONFIG_VIDEO_IR=m
-CONFIG_VIDEO_TVEEPROM=m
+CONFIG_DVB_CORE=m
##
## file: drivers/media/common/Kconfig
@@ -351,11 +353,6 @@
CONFIG_VIDEO_SAA7146_VV=m
##
-## file: drivers/media/dvb/dvb-core/Kconfig
-##
-CONFIG_DVB_CORE=m
-
-##
## file: drivers/media/radio/Kconfig
##
# CONFIG_RADIO_GEMTEK_PCI is not set
@@ -364,6 +361,14 @@
# CONFIG_USB_DSBR is not set
##
+## file: drivers/media/video/Kconfig
+##
+CONFIG_VIDEO_BTCX=m
+CONFIG_VIDEO_IR=m
+CONFIG_VIDEO_TVEEPROM=m
+CONFIG_VIDEO_TUNER=m
+
+##
## file: drivers/message/i2o/Kconfig
##
# CONFIG_I2O is not set
@@ -473,7 +478,6 @@
CONFIG_TUN=m
CONFIG_NET_ETHERNET=y
CONFIG_MII=y
-CONFIG_IXP4XX_ETH=m
# CONFIG_AX88796 is not set
# CONFIG_HAPPYMEAL is not set
# CONFIG_SUNGEM is not set
@@ -483,19 +487,12 @@
# CONFIG_DM9000 is not set
CONFIG_ENC28J60=m
# CONFIG_ENC28J60_WRITEVERIFY is not set
-# CONFIG_NET_TULIP is not set
# CONFIG_HP100 is not set
-# CONFIG_IBM_NEW_EMAC_ZMII is not set
-# CONFIG_IBM_NEW_EMAC_RGMII is not set
-# CONFIG_IBM_NEW_EMAC_TAH is not set
-# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
# CONFIG_NET_PCI is not set
# CONFIG_B44 is not set
# CONFIG_NET_POCKET is not set
# CONFIG_NETDEV_1000 is not set
# CONFIG_NETDEV_10000 is not set
-# CONFIG_TR is not set
-
# CONFIG_S2IO is not set
# CONFIG_FDDI is not set
# CONFIG_HIPPI is not set
@@ -519,6 +516,19 @@
# CONFIG_ARCNET is not set
##
+## file: drivers/net/arm/Kconfig
+##
+CONFIG_IXP4XX_ETH=m
+
+##
+## file: drivers/net/ibm_newemac/Kconfig
+##
+# CONFIG_IBM_NEW_EMAC_ZMII is not set
+# CONFIG_IBM_NEW_EMAC_RGMII is not set
+# CONFIG_IBM_NEW_EMAC_TAH is not set
+# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
+
+##
## file: drivers/net/phy/Kconfig
##
CONFIG_PHYLIB=m
@@ -612,19 +622,12 @@
CONFIG_SCSI_FC_ATTRS=m
CONFIG_SCSI_ISCSI_ATTRS=m
CONFIG_SCSI_SAS_ATTRS=m
-
# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
# CONFIG_SCSI_3W_9XXX is not set
# CONFIG_SCSI_AACRAID is not set
-# CONFIG_SCSI_AIC7XXX is not set
# CONFIG_SCSI_AIC7XXX_OLD is not set
-# CONFIG_SCSI_AIC79XX is not set
-# CONFIG_SCSI_AIC94XX is not set
# CONFIG_SCSI_DPT_I2O is not set
# CONFIG_SCSI_ARCMSR is not set
-# CONFIG_MEGARAID_NEWGEN is not set
-# CONFIG_MEGARAID_LEGACY is not set
-# CONFIG_MEGARAID_SAS is not set
# CONFIG_SCSI_HPTIOP is not set
# CONFIG_SCSI_DMX3191D is not set
# CONFIG_SCSI_FUTURE_DOMAIN is not set
@@ -637,15 +640,44 @@
# CONFIG_SCSI_STEX is not set
# CONFIG_SCSI_SYM53C8XX_2 is not set
# CONFIG_SCSI_QLOGIC_1280 is not set
-# CONFIG_SCSI_QLA_FC is not set
-# CONFIG_SCSI_QLA_ISCSI is not set
# CONFIG_SCSI_LPFC is not set
# CONFIG_SCSI_DC395x is not set
# CONFIG_SCSI_DC390T is not set
# CONFIG_SCSI_NSP32 is not set
# CONFIG_SCSI_DEBUG is not set
# CONFIG_SCSI_SRP is not set
-# CONFIG_ATA is not set
+
+##
+## file: drivers/scsi/aic7xxx/Kconfig.aic79xx
+##
+# CONFIG_SCSI_AIC79XX is not set
+
+##
+## file: drivers/scsi/aic7xxx/Kconfig.aic7xxx
+##
+# CONFIG_SCSI_AIC7XXX is not set
+
+##
+## file: drivers/scsi/aic94xx/Kconfig
+##
+# CONFIG_SCSI_AIC94XX is not set
+
+##
+## file: drivers/scsi/megaraid/Kconfig.megaraid
+##
+# CONFIG_MEGARAID_NEWGEN is not set
+# CONFIG_MEGARAID_LEGACY is not set
+# CONFIG_MEGARAID_SAS is not set
+
+##
+## file: drivers/scsi/qla2xxx/Kconfig
+##
+# CONFIG_SCSI_QLA_FC is not set
+
+##
+## file: drivers/scsi/qla4xxx/Kconfig
+##
+# CONFIG_SCSI_QLA_ISCSI is not set
##
## file: drivers/serial/Kconfig
Modified: dists/trunk/linux-2.6/debian/config/arm/config.orion5x
==============================================================================
--- dists/trunk/linux-2.6/debian/config/arm/config.orion5x (original)
+++ dists/trunk/linux-2.6/debian/config/arm/config.orion5x Wed May 28 22:03:10 2008
@@ -65,6 +65,7 @@
# CONFIG_ARCH_OMAP is not set
# CONFIG_ARCH_MSM7X00A is not set
## end choice
+CONFIG_PLAT_ORION=y
CONFIG_PCI=y
CONFIG_PCI_SYSCALL=y
CONFIG_HZ=100
@@ -86,21 +87,14 @@
CONFIG_ARCH_SUSPEND_POSSIBLE=y
##
-## file: arch/arm/mach-orion/Kconfig
+## file: arch/arm/mach-orion5x/Kconfig
##
CONFIG_MACH_DB88F5281=y
CONFIG_MACH_RD88F5182=y
CONFIG_MACH_KUROBOX_PRO=y
CONFIG_MACH_DNS323=y
CONFIG_MACH_TS209=y
-CONFIG_MACH_TS409=y
CONFIG_MACH_LINKSTATION_PRO=y
-CONFIG_MACH_MV2120=y
-
-#
-## Power management
-#
-CONFIG_PLAT_ORION=y
##
## file: arch/arm/mm/Kconfig
@@ -122,42 +116,6 @@
# CONFIG_OUTER_CACHE is not set
##
-## file: drivers/scsi/Kconfig
-##
-# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
-# CONFIG_SCSI_3W_9XXX is not set
-# CONFIG_SCSI_AACRAID is not set
-# CONFIG_SCSI_AIC7XXX is not set
-# CONFIG_SCSI_AIC7XXX_OLD is not set
-# CONFIG_SCSI_AIC79XX is not set
-# CONFIG_SCSI_AIC94XX is not set
-# CONFIG_SCSI_DPT_I2O is not set
-# CONFIG_SCSI_ARCMSR is not set
-# CONFIG_MEGARAID_NEWGEN is not set
-# CONFIG_MEGARAID_LEGACY is not set
-# CONFIG_MEGARAID_SAS is not set
-# CONFIG_SCSI_HPTIOP is not set
-# CONFIG_SCSI_DMX3191D is not set
-# CONFIG_SCSI_FUTURE_DOMAIN is not set
-# CONFIG_SCSI_IPS is not set
-# CONFIG_SCSI_INITIO is not set
-# CONFIG_SCSI_INIA100 is not set
-# CONFIG_SCSI_PPA is not set
-# CONFIG_SCSI_IMM is not set
-# CONFIG_SCSI_MVSAS is not set
-# CONFIG_SCSI_STEX is not set
-# CONFIG_SCSI_SYM53C8XX_2 is not set
-# CONFIG_SCSI_IPR is not set
-# CONFIG_SCSI_QLOGIC_1280 is not set
-# CONFIG_SCSI_QLA_FC is not set
-# CONFIG_SCSI_QLA_ISCSI is not set
-# CONFIG_SCSI_LPFC is not set
-# CONFIG_SCSI_DC395x is not set
-# CONFIG_SCSI_DC390T is not set
-# CONFIG_SCSI_NSP32 is not set
-# CONFIG_SCSI_DEBUG is not set
-
-##
## file: drivers/ata/Kconfig
##
CONFIG_ATA=m
@@ -240,12 +198,12 @@
## file: drivers/media/Kconfig
##
CONFIG_VIDEO_DEV=m
-CONFIG_VIDEO_V4L1=y
+CONFIG_DVB_CORE=m
##
-## file: drivers/media/dvb/dvb-core/Kconfig
+## file: drivers/media/video/Kconfig
##
-CONFIG_DVB_CORE=m
+CONFIG_VIDEO_V4L1=y
##
## file: drivers/mtd/Kconfig
@@ -396,9 +354,69 @@
CONFIG_RTC_CLASS=y
CONFIG_RTC_DRV_DS1307=y
CONFIG_RTC_DRV_RS5C372=y
+CONFIG_RTC_DRV_PCF8563=y
CONFIG_RTC_DRV_M41T80=y
CONFIG_RTC_DRV_S35390A=y
-CONFIG_RTC_DRV_PCF8563=y
+
+##
+## file: drivers/scsi/Kconfig
+##
+# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
+# CONFIG_SCSI_3W_9XXX is not set
+# CONFIG_SCSI_AACRAID is not set
+# CONFIG_SCSI_AIC7XXX_OLD is not set
+# CONFIG_SCSI_DPT_I2O is not set
+# CONFIG_SCSI_ARCMSR is not set
+# CONFIG_SCSI_HPTIOP is not set
+# CONFIG_SCSI_DMX3191D is not set
+# CONFIG_SCSI_FUTURE_DOMAIN is not set
+# CONFIG_SCSI_IPS is not set
+# CONFIG_SCSI_INITIO is not set
+# CONFIG_SCSI_INIA100 is not set
+# CONFIG_SCSI_PPA is not set
+# CONFIG_SCSI_IMM is not set
+# CONFIG_SCSI_MVSAS is not set
+# CONFIG_SCSI_STEX is not set
+# CONFIG_SCSI_SYM53C8XX_2 is not set
+# CONFIG_SCSI_IPR is not set
+# CONFIG_SCSI_QLOGIC_1280 is not set
+# CONFIG_SCSI_LPFC is not set
+# CONFIG_SCSI_DC395x is not set
+# CONFIG_SCSI_DC390T is not set
+# CONFIG_SCSI_NSP32 is not set
+# CONFIG_SCSI_DEBUG is not set
+
+##
+## file: drivers/scsi/aic7xxx/Kconfig.aic79xx
+##
+# CONFIG_SCSI_AIC79XX is not set
+
+##
+## file: drivers/scsi/aic7xxx/Kconfig.aic7xxx
+##
+# CONFIG_SCSI_AIC7XXX is not set
+
+##
+## file: drivers/scsi/aic94xx/Kconfig
+##
+# CONFIG_SCSI_AIC94XX is not set
+
+##
+## file: drivers/scsi/megaraid/Kconfig.megaraid
+##
+# CONFIG_MEGARAID_NEWGEN is not set
+# CONFIG_MEGARAID_LEGACY is not set
+# CONFIG_MEGARAID_SAS is not set
+
+##
+## file: drivers/scsi/qla2xxx/Kconfig
+##
+# CONFIG_SCSI_QLA_FC is not set
+
+##
+## file: drivers/scsi/qla4xxx/Kconfig
+##
+# CONFIG_SCSI_QLA_ISCSI is not set
##
## file: drivers/serial/Kconfig
@@ -525,3 +543,9 @@
CONFIG_BOUNCE=y
CONFIG_VIRT_TO_BUS=y
+##
+## file: unknown
+##
+CONFIG_MACH_MV2120=y
+CONFIG_MACH_TS409=y
+
Modified: dists/trunk/linux-2.6/debian/config/arm/config.versatile
==============================================================================
--- dists/trunk/linux-2.6/debian/config/arm/config.versatile (original)
+++ dists/trunk/linux-2.6/debian/config/arm/config.versatile Wed May 28 22:03:10 2008
@@ -122,11 +122,11 @@
## file: crypto/Kconfig
##
#. TODO
+# CONFIG_CRYPTO_AUTHENC is not set
+#. TODO
# CONFIG_CRYPTO_XTS is not set
#. TODO
# CONFIG_CRYPTO_SEED is not set
-#. TODO
-# CONFIG_CRYPTO_AUTHENC is not set
##
## file: crypto/async_tx/Kconfig
@@ -141,6 +141,7 @@
CONFIG_ATA=m
# CONFIG_ATA_NONSTANDARD is not set
CONFIG_SATA_AHCI=m
+CONFIG_SATA_SIL24=m
# CONFIG_SATA_SVW is not set
# CONFIG_ATA_PIIX is not set
# CONFIG_SATA_MV is not set
@@ -150,7 +151,6 @@
CONFIG_SATA_PROMISE=m
CONFIG_SATA_SX4=m
CONFIG_SATA_SIL=m
-CONFIG_SATA_SIL24=m
# CONFIG_SATA_SIS is not set
# CONFIG_SATA_ULI is not set
CONFIG_SATA_VIA=m
@@ -438,11 +438,8 @@
## file: drivers/media/Kconfig
##
CONFIG_VIDEO_DEV=m
-CONFIG_VIDEO_V4L1=y
CONFIG_VIDEO_V4L1_COMPAT=y
-CONFIG_VIDEO_V4L2=y
-CONFIG_VIDEOBUF_GEN=m
-CONFIG_VIDEOBUF_VMALLOC=m
+CONFIG_DVB_CORE=m
CONFIG_DAB=y
# CONFIG_USB_DABUSB is not set
@@ -457,12 +454,6 @@
# CONFIG_DVB_CINERGYT2 is not set
##
-## file: drivers/media/dvb/dvb-core/Kconfig
-##
-CONFIG_DVB_CORE=m
-CONFIG_DVB_CORE_ATTACH=y
-
-##
## file: drivers/media/dvb/frontends/Kconfig
##
# CONFIG_DVB_FE_CUSTOMISE is not set
@@ -484,6 +475,10 @@
##
## file: drivers/media/video/Kconfig
##
+CONFIG_VIDEO_V4L2=y
+CONFIG_VIDEO_V4L1=y
+CONFIG_VIDEOBUF_GEN=m
+CONFIG_VIDEOBUF_VMALLOC=m
CONFIG_VIDEO_CAPTURE_DRIVERS=y
# CONFIG_VIDEO_ADV_DEBUG is not set
CONFIG_VIDEO_HELPER_CHIPS_AUTO=y
@@ -771,7 +766,6 @@
# CONFIG_USB_ZD1201 is not set
CONFIG_RTL8187=m
# CONFIG_ADM8211 is not set
-# CONFIG_P54_COMMON is not set
##
## file: drivers/net/wireless/b43/Kconfig
@@ -792,6 +786,11 @@
# CONFIG_HOSTAP_PCI is not set
##
+## file: drivers/net/wireless/p54/Kconfig
+##
+# CONFIG_P54_COMMON is not set
+
+##
## file: drivers/net/wireless/rt2x00/Kconfig
##
# CONFIG_RT2X00 is not set
@@ -1611,3 +1610,8 @@
##
# CONFIG_SND_SOC is not set
+##
+## file: unknown
+##
+CONFIG_DVB_CORE_ATTACH=y
+
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 Wed May 28 22:03:10 2008
@@ -24,49 +24,49 @@
## file: crypto/Kconfig
##
CONFIG_CRYPTO=y
-CONFIG_CRYPTO_SEQIV=m
CONFIG_CRYPTO_MANAGER=y
+CONFIG_CRYPTO_GF128MUL=m
+CONFIG_CRYPTO_NULL=m
+# CONFIG_CRYPTO_CRYPTD is not set
+CONFIG_CRYPTO_AUTHENC=m
+CONFIG_CRYPTO_TEST=m
+CONFIG_CRYPTO_CCM=m
+CONFIG_CRYPTO_GCM=m
+CONFIG_CRYPTO_SEQIV=m
+CONFIG_CRYPTO_CBC=m
+CONFIG_CRYPTO_CTR=m
+CONFIG_CRYPTO_CTS=m
+CONFIG_CRYPTO_ECB=m
+CONFIG_CRYPTO_LRW=m
+CONFIG_CRYPTO_PCBC=m
+CONFIG_CRYPTO_XTS=m
CONFIG_CRYPTO_HMAC=y
CONFIG_CRYPTO_XCBC=m
-CONFIG_CRYPTO_NULL=m
+CONFIG_CRYPTO_CRC32C=m
CONFIG_CRYPTO_MD4=m
CONFIG_CRYPTO_MD5=y
+CONFIG_CRYPTO_MICHAEL_MIC=m
CONFIG_CRYPTO_SHA1=m
CONFIG_CRYPTO_SHA256=m
CONFIG_CRYPTO_SHA512=m
-CONFIG_CRYPTO_WP512=m
CONFIG_CRYPTO_TGR192=m
-CONFIG_CRYPTO_GF128MUL=m
-CONFIG_CRYPTO_CTS=m
-CONFIG_CRYPTO_ECB=m
-CONFIG_CRYPTO_CBC=m
-CONFIG_CRYPTO_PCBC=m
-CONFIG_CRYPTO_LRW=m
-CONFIG_CRYPTO_XTS=m
-CONFIG_CRYPTO_CTR=m
-CONFIG_CRYPTO_GCM=m
-CONFIG_CRYPTO_CCM=m
-# CONFIG_CRYPTO_CRYPTD is not set
-CONFIG_CRYPTO_DES=m
-CONFIG_CRYPTO_FCRYPT=m
-CONFIG_CRYPTO_BLOWFISH=m
-CONFIG_CRYPTO_TWOFISH=m
-CONFIG_CRYPTO_SERPENT=m
+CONFIG_CRYPTO_WP512=m
CONFIG_CRYPTO_AES=m
+CONFIG_CRYPTO_ANUBIS=m
+CONFIG_CRYPTO_ARC4=m
+CONFIG_CRYPTO_BLOWFISH=m
+CONFIG_CRYPTO_CAMELLIA=m
CONFIG_CRYPTO_CAST5=m
CONFIG_CRYPTO_CAST6=m
-CONFIG_CRYPTO_TEA=m
-CONFIG_CRYPTO_ARC4=m
+CONFIG_CRYPTO_DES=m
+CONFIG_CRYPTO_FCRYPT=m
CONFIG_CRYPTO_KHAZAD=m
-CONFIG_CRYPTO_ANUBIS=m
-CONFIG_CRYPTO_SEED=m
CONFIG_CRYPTO_SALSA20=m
+CONFIG_CRYPTO_SEED=m
+CONFIG_CRYPTO_SERPENT=m
+CONFIG_CRYPTO_TEA=m
+CONFIG_CRYPTO_TWOFISH=m
CONFIG_CRYPTO_DEFLATE=m
-CONFIG_CRYPTO_MICHAEL_MIC=m
-CONFIG_CRYPTO_CRC32C=m
-CONFIG_CRYPTO_CAMELLIA=m
-CONFIG_CRYPTO_TEST=m
-CONFIG_CRYPTO_AUTHENC=m
CONFIG_CRYPTO_LZO=m
##
@@ -82,6 +82,8 @@
CONFIG_ATA_ACPI=y
CONFIG_SATA_PMP=y
CONFIG_SATA_AHCI=m
+CONFIG_SATA_SIL24=m
+CONFIG_ATA_SFF=y
CONFIG_SATA_SVW=m
CONFIG_ATA_PIIX=m
CONFIG_SATA_MV=m
@@ -91,8 +93,6 @@
CONFIG_SATA_PROMISE=m
CONFIG_SATA_SX4=m
CONFIG_SATA_SIL=m
-CONFIG_SATA_SIL24=m
-CONFIG_ATA_SFF=y
CONFIG_SATA_SIS=m
CONFIG_SATA_ULI=m
CONFIG_SATA_VIA=m
@@ -519,15 +519,23 @@
## file: drivers/media/Kconfig
##
CONFIG_VIDEO_DEV=m
-CONFIG_VIDEO_V4L1=y
-CONFIG_VIDEO_V4L1_COMPAT=y
CONFIG_VIDEO_ALLOW_V4L1=y
-# CONFIG_MEDIA_TUNER_CUSTOMIZE is not set
-CONFIG_MEDIA_TUNER_TEA5761=y
+CONFIG_VIDEO_V4L1_COMPAT=y
CONFIG_DAB=y
CONFIG_USB_DABUSB=m
##
+## file: drivers/media/common/tuners/Kconfig
+##
+CONFIG_MEDIA_ATTACH=y
+# CONFIG_MEDIA_TUNER_CUSTOMIZE is not set
+CONFIG_MEDIA_TUNER_TDA827X=m
+CONFIG_MEDIA_TUNER_TEA5761=y
+CONFIG_MEDIA_TUNER_MT2060=m
+CONFIG_MEDIA_TUNER_MT2131=m
+CONFIG_MEDIA_TUNER_QT1010=m
+
+##
## file: drivers/media/dvb/Kconfig
##
CONFIG_DVB_CAPTURE_DRIVERS=y
@@ -552,11 +560,6 @@
# CONFIG_DVB_CINERGYT2_TUNING is not set
##
-## file: drivers/media/dvb/dvb-core/Kconfig
-##
-CONFIG_MEDIA_ATTACH=y
-
-##
## file: drivers/media/dvb/dvb-usb/Kconfig
##
CONFIG_DVB_USB=m
@@ -586,15 +589,17 @@
## file: drivers/media/dvb/frontends/Kconfig
##
# CONFIG_DVB_FE_CUSTOMISE is not set
-CONFIG_DVB_STV0299=m
CONFIG_DVB_CX24110=m
CONFIG_DVB_CX24123=m
-CONFIG_DVB_TDA8083=m
CONFIG_DVB_MT312=m
-CONFIG_DVB_VES1X93=m
-CONFIG_DVB_TUNER_ITD1000=m
CONFIG_DVB_S5H1420=m
+CONFIG_DVB_STV0299=m
+CONFIG_DVB_TDA8083=m
CONFIG_DVB_TDA10086=m
+CONFIG_DVB_VES1X93=m
+CONFIG_DVB_TUNER_ITD1000=m
+CONFIG_DVB_TDA826X=m
+CONFIG_DVB_TUA6100=m
CONFIG_DVB_SP8870=m
CONFIG_DVB_SP887X=m
CONFIG_DVB_CX22700=m
@@ -620,15 +625,9 @@
CONFIG_DVB_S5H1409=m
CONFIG_DVB_AU8522=m
CONFIG_DVB_PLL=m
-CONFIG_DVB_TDA826X=m
-CONFIG_MEDIA_TUNER_TDA827X=m
-CONFIG_MEDIA_TUNER_QT1010=m
-CONFIG_MEDIA_TUNER_MT2060=m
-CONFIG_MEDIA_TUNER_MT2131=m
CONFIG_DVB_LNBP21=m
CONFIG_DVB_ISL6405=m
CONFIG_DVB_ISL6421=m
-CONFIG_DVB_TUA6100=m
##
## file: drivers/media/dvb/pluto2/Kconfig
@@ -665,6 +664,7 @@
##
## file: drivers/media/video/Kconfig
##
+CONFIG_VIDEO_V4L1=y
CONFIG_VIDEO_CAPTURE_DRIVERS=y
# CONFIG_VIDEO_ADV_DEBUG is not set
CONFIG_VIDEO_HELPER_CHIPS_AUTO=y
@@ -906,8 +906,8 @@
##
## file: drivers/mtd/Kconfig
##
-CONFIG_MTD_BLKDEVS=m
CONFIG_MTD_AR7_PARTS=m
+CONFIG_MTD_BLKDEVS=m
CONFIG_RFD_FTL=m
CONFIG_SSFDC=m
CONFIG_MTD_OOPS=m
@@ -1163,9 +1163,10 @@
CONFIG_RTL8180=m
CONFIG_RTL8187=m
CONFIG_ADM8211=m
-CONFIG_P54_COMMON=m
-CONFIG_P54_USB=m
-CONFIG_P54_PCI=m
+
+##
+## file: drivers/net/wireless/ath5k/Kconfig
+##
CONFIG_ATH5K=m
# CONFIG_ATH5K_DEBUG is not set
@@ -1213,6 +1214,13 @@
# CONFIG_IWL3945_DEBUG is not set
##
+## file: drivers/net/wireless/p54/Kconfig
+##
+CONFIG_P54_COMMON=m
+CONFIG_P54_USB=m
+CONFIG_P54_PCI=m
+
+##
## file: drivers/net/wireless/rt2x00/Kconfig
##
CONFIG_RT2X00=m
@@ -1481,10 +1489,10 @@
## file: drivers/usb/host/Kconfig
##
CONFIG_USB_C67X00_HCD=m
-CONFIG_USB_ISP1760_HCD=m
-# CONFIG_USB_ISP1760_PCI is not set
CONFIG_USB_EHCI_TT_NEWSCHED=y
CONFIG_USB_ISP116X_HCD=m
+CONFIG_USB_ISP1760_HCD=m
+# CONFIG_USB_ISP1760_PCI is not set
CONFIG_USB_U132_HCD=m
CONFIG_USB_R8A66597_HCD=m
Modified: dists/trunk/linux-2.6/debian/config/hppa/config.parisc
==============================================================================
--- dists/trunk/linux-2.6/debian/config/hppa/config.parisc (original)
+++ dists/trunk/linux-2.6/debian/config/hppa/config.parisc Wed May 28 22:03:10 2008
@@ -16,11 +16,6 @@
CONFIG_TLAN=m
##
-## file: drivers/net/tulip/Kconfig
-##
-# CONFIG_PCMCIA_XIRTULIP is not set
-
-##
## file: drivers/net/wireless/Kconfig
##
# CONFIG_ARLAN is not set
@@ -42,3 +37,8 @@
##
CONFIG_BROKEN_ON_SMP=y
+##
+## file: unknown
+##
+# CONFIG_PCMCIA_XIRTULIP is not set
+
Modified: dists/trunk/linux-2.6/debian/config/hppa/config.parisc64
==============================================================================
--- dists/trunk/linux-2.6/debian/config/hppa/config.parisc64 (original)
+++ dists/trunk/linux-2.6/debian/config/hppa/config.parisc64 Wed May 28 22:03:10 2008
@@ -17,11 +17,6 @@
# CONFIG_NI5010 is not set
##
-## file: drivers/net/tulip/Kconfig
-##
-# CONFIG_PCMCIA_XIRTULIP is not set
-
-##
## file: init/Kconfig
##
CONFIG_BROKEN_ON_SMP=y
@@ -35,3 +30,8 @@
CONFIG_DISCONTIGMEM=y
CONFIG_NEED_MULTIPLE_NODES=y
+##
+## file: unknown
+##
+# CONFIG_PCMCIA_XIRTULIP is not set
+
Modified: dists/trunk/linux-2.6/debian/config/i386/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/i386/config (original)
+++ dists/trunk/linux-2.6/debian/config/i386/config Wed May 28 22:03:10 2008
@@ -112,7 +112,9 @@
# CONFIG_DEBUG_NX_TEST is not set
# CONFIG_4KSTACKS is not set
CONFIG_DOUBLEFAULT=y
+## choice: IO delay type
CONFIG_IO_DELAY_0X80=y
+## end choice
# CONFIG_DEBUG_BOOT_PARAMS is not set
# CONFIG_CPA_DEBUG is not set
@@ -158,9 +160,9 @@
##
## file: crypto/Kconfig
##
-CONFIG_CRYPTO_TWOFISH_586=m
CONFIG_CRYPTO_AES_586=m
CONFIG_CRYPTO_SALSA20_586=m
+CONFIG_CRYPTO_TWOFISH_586=m
##
## file: drivers/acpi/Kconfig
@@ -861,7 +863,7 @@
# CONFIG_MACINTOSH_DRIVERS is not set
##
-## file: drivers/media/dvb/dvb-core/Kconfig
+## file: drivers/media/Kconfig
##
CONFIG_DVB_CORE=m
@@ -1528,6 +1530,7 @@
##
CONFIG_VIDEO_OUTPUT_CONTROL=m
CONFIG_FB=y
+CONFIG_FB_HECUBA=m
CONFIG_FB_MODE_HELPERS=y
CONFIG_FB_TILEBLITTING=y
CONFIG_FB_CIRRUS=m
@@ -1540,7 +1543,6 @@
CONFIG_FB_VESA=y
CONFIG_FB_EFI=y
# CONFIG_FB_IMAC is not set
-CONFIG_FB_HECUBA=m
CONFIG_FB_N411=m
CONFIG_FB_HGA=m
# CONFIG_FB_HGA_ACCEL is not set
@@ -1610,7 +1612,6 @@
CONFIG_FB_GEODE=y
CONFIG_FB_GEODE_LX=m
CONFIG_FB_GEODE_GX=m
-# CONFIG_FB_GEODE_GX_SET_FBSIZE is not set
CONFIG_FB_GEODE_GX1=m
##
@@ -1989,3 +1990,8 @@
##
CONFIG_SND_USB_USX2Y=m
+##
+## file: unknown
+##
+# CONFIG_FB_GEODE_GX_SET_FBSIZE is not set
+
Modified: dists/trunk/linux-2.6/debian/config/i386/config.486
==============================================================================
--- dists/trunk/linux-2.6/debian/config/i386/config.486 (original)
+++ dists/trunk/linux-2.6/debian/config/i386/config.486 Wed May 28 22:03:10 2008
@@ -100,11 +100,6 @@
CONFIG_MADGEMC=m
##
-## file: drivers/net/tulip/Kconfig
-##
-CONFIG_PCMCIA_XIRTULIP=m
-
-##
## file: drivers/pci/hotplug/Kconfig
##
CONFIG_HOTPLUG_PCI_COMPAQ_NVRAM=y
@@ -128,3 +123,8 @@
##
CONFIG_LOG_BUF_SHIFT=14
+##
+## file: unknown
+##
+CONFIG_PCMCIA_XIRTULIP=m
+
Modified: dists/trunk/linux-2.6/debian/config/i386/config.686
==============================================================================
--- dists/trunk/linux-2.6/debian/config/i386/config.686 (original)
+++ dists/trunk/linux-2.6/debian/config/i386/config.686 Wed May 28 22:03:10 2008
@@ -68,11 +68,6 @@
# CONFIG_DMASCC is not set
##
-## file: drivers/net/tulip/Kconfig
-##
-# CONFIG_PCMCIA_XIRTULIP is not set
-
-##
## file: drivers/pci/hotplug/Kconfig
##
# CONFIG_HOTPLUG_PCI_COMPAQ_NVRAM is not set
@@ -87,3 +82,8 @@
##
# CONFIG_DEBUG_HIGHMEM is not set
+##
+## file: unknown
+##
+# CONFIG_PCMCIA_XIRTULIP is not set
+
Modified: dists/trunk/linux-2.6/debian/config/i386/config.686-bigmem
==============================================================================
--- dists/trunk/linux-2.6/debian/config/i386/config.686-bigmem (original)
+++ dists/trunk/linux-2.6/debian/config/i386/config.686-bigmem Wed May 28 22:03:10 2008
@@ -71,11 +71,6 @@
# CONFIG_DMASCC is not set
##
-## file: drivers/net/tulip/Kconfig
-##
-# CONFIG_PCMCIA_XIRTULIP is not set
-
-##
## file: drivers/pci/hotplug/Kconfig
##
# CONFIG_HOTPLUG_PCI_COMPAQ_NVRAM is not set
@@ -90,3 +85,8 @@
##
# CONFIG_DEBUG_HIGHMEM is not set
+##
+## file: unknown
+##
+# CONFIG_PCMCIA_XIRTULIP is not set
+
Modified: dists/trunk/linux-2.6/debian/config/ia64/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/ia64/config (original)
+++ dists/trunk/linux-2.6/debian/config/ia64/config Wed May 28 22:03:10 2008
@@ -7,7 +7,6 @@
##
## file: arch/ia64/Kconfig
##
-CONFIG_IA64_SGI_SN_XP=m
CONFIG_HOTPLUG_CPU=y
CONFIG_SCHED_SMT=y
CONFIG_PERMIT_BSP_REMOVE=y
@@ -446,7 +445,7 @@
CONFIG_ISDN_DIVAS_MAINT=m
##
-## file: drivers/media/dvb/dvb-core/Kconfig
+## file: drivers/media/Kconfig
##
CONFIG_DVB_CORE=m
@@ -1080,6 +1079,7 @@
## file: unknown
##
CONFIG_DMA_IS_DMA32=y
+CONFIG_IA64_SGI_SN_XP=m
CONFIG_SERIAL_8250_ACPI=y
CONFIG_SERIAL_8250_MULTIPORT=y
CONFIG_SOUND_AD1980=m
Modified: dists/trunk/linux-2.6/debian/config/m68k/config.amiga
==============================================================================
--- dists/trunk/linux-2.6/debian/config/m68k/config.amiga (original)
+++ dists/trunk/linux-2.6/debian/config/m68k/config.amiga Wed May 28 22:03:10 2008
@@ -24,7 +24,6 @@
CONFIG_ISA=y
CONFIG_GENERIC_ISA_DMA=y
CONFIG_AMIGA_BUILTIN_SERIAL=y
-# CONFIG_WHIPPET_SERIAL is not set
CONFIG_MULTIFACE_III_TTY=m
# CONFIG_SERIAL_CONSOLE is not set
@@ -310,4 +309,5 @@
# CONFIG_OKTAGON_SCSI is not set
CONFIG_SCSI_AMIGA7XX=y
# CONFIG_SCSI_NCR53C7xx_FAST is not set
+# CONFIG_WHIPPET_SERIAL is not set
Modified: dists/trunk/linux-2.6/debian/config/mips/config.4kc-malta
==============================================================================
--- dists/trunk/linux-2.6/debian/config/mips/config.4kc-malta (original)
+++ dists/trunk/linux-2.6/debian/config/mips/config.4kc-malta Wed May 28 22:03:10 2008
@@ -181,6 +181,7 @@
CONFIG_ATA=y
# CONFIG_ATA_NONSTANDARD is not set
CONFIG_SATA_AHCI=y
+CONFIG_SATA_SIL24=y
# CONFIG_SATA_SVW is not set
# CONFIG_ATA_PIIX is not set
CONFIG_SATA_MV=y
@@ -190,7 +191,6 @@
CONFIG_SATA_PROMISE=y
CONFIG_SATA_SX4=y
CONFIG_SATA_SIL=y
-CONFIG_SATA_SIL24=y
# CONFIG_SATA_SIS is not set
# CONFIG_SATA_ULI is not set
# CONFIG_SATA_VIA is not set
@@ -736,13 +736,8 @@
## file: drivers/media/Kconfig
##
CONFIG_VIDEO_DEV=m
-CONFIG_VIDEO_V4L1=y
CONFIG_VIDEO_V4L1_COMPAT=y
-CONFIG_VIDEO_V4L2=y
-CONFIG_VIDEO_TUNER=m
-CONFIG_VIDEO_BTCX=m
-CONFIG_VIDEO_IR=m
-CONFIG_VIDEO_TVEEPROM=m
+CONFIG_DVB_CORE=m
##
## file: drivers/media/common/Kconfig
@@ -751,21 +746,14 @@
CONFIG_VIDEO_SAA7146_VV=m
##
-## file: drivers/media/dvb/dvb-core/Kconfig
-##
-CONFIG_DVB_CORE=m
-CONFIG_DVB_CORE_ATTACH=y
-
-##
## file: drivers/media/dvb/frontends/Kconfig
##
# CONFIG_DVB_FE_CUSTOMISE is not set
-CONFIG_DVB_PLL=m
CONFIG_DVB_TDA826X=m
-CONFIG_DVB_TUNER_MT2060=m
+CONFIG_DVB_TUA6100=m
+CONFIG_DVB_PLL=m
CONFIG_DVB_LNBP21=m
CONFIG_DVB_ISL6421=m
-CONFIG_DVB_TUA6100=m
##
## file: drivers/media/radio/Kconfig
@@ -778,6 +766,12 @@
##
## file: drivers/media/video/Kconfig
##
+CONFIG_VIDEO_V4L2=y
+CONFIG_VIDEO_V4L1=y
+CONFIG_VIDEO_BTCX=m
+CONFIG_VIDEO_IR=m
+CONFIG_VIDEO_TVEEPROM=m
+CONFIG_VIDEO_TUNER=m
# CONFIG_VIDEO_ADV_DEBUG is not set
CONFIG_VIDEO_HELPER_CHIPS_AUTO=y
CONFIG_VIDEO_TVAUDIO=m
@@ -2354,6 +2348,8 @@
## file: unknown
##
# CONFIG_DDB5477 is not set
+CONFIG_DVB_CORE_ATTACH=y
+CONFIG_DVB_TUNER_MT2060=m
CONFIG_IP_NF_TARGET_TCPMSS=m
# CONFIG_MIPS_EV64120 is not set
CONFIG_MIPS_GT64120=y
Modified: dists/trunk/linux-2.6/debian/config/mips/config.5kc-malta
==============================================================================
--- dists/trunk/linux-2.6/debian/config/mips/config.5kc-malta (original)
+++ dists/trunk/linux-2.6/debian/config/mips/config.5kc-malta Wed May 28 22:03:10 2008
@@ -171,6 +171,7 @@
CONFIG_ATA=y
# CONFIG_ATA_NONSTANDARD is not set
CONFIG_SATA_AHCI=y
+CONFIG_SATA_SIL24=y
# CONFIG_SATA_SVW is not set
# CONFIG_ATA_PIIX is not set
CONFIG_SATA_MV=y
@@ -180,7 +181,6 @@
CONFIG_SATA_PROMISE=y
CONFIG_SATA_SX4=y
CONFIG_SATA_SIL=y
-CONFIG_SATA_SIL24=y
# CONFIG_SATA_SIS is not set
# CONFIG_SATA_ULI is not set
# CONFIG_SATA_VIA is not set
@@ -804,13 +804,8 @@
## file: drivers/media/Kconfig
##
CONFIG_VIDEO_DEV=m
-CONFIG_VIDEO_V4L1=y
CONFIG_VIDEO_V4L1_COMPAT=y
-CONFIG_VIDEO_V4L2=y
-CONFIG_VIDEO_TUNER=m
-CONFIG_VIDEO_BTCX=m
-CONFIG_VIDEO_IR=m
-CONFIG_VIDEO_TVEEPROM=m
+CONFIG_DVB_CORE=m
##
## file: drivers/media/common/Kconfig
@@ -843,12 +838,6 @@
# CONFIG_DVB_CINERGYT2_TUNING is not set
##
-## file: drivers/media/dvb/dvb-core/Kconfig
-##
-CONFIG_DVB_CORE=m
-CONFIG_DVB_CORE_ATTACH=y
-
-##
## file: drivers/media/dvb/dvb-usb/Kconfig
##
CONFIG_DVB_USB=m
@@ -876,14 +865,16 @@
## file: drivers/media/dvb/frontends/Kconfig
##
# CONFIG_DVB_FE_CUSTOMISE is not set
-CONFIG_DVB_STV0299=m
CONFIG_DVB_CX24110=m
CONFIG_DVB_CX24123=m
-CONFIG_DVB_TDA8083=m
CONFIG_DVB_MT312=m
-CONFIG_DVB_VES1X93=m
CONFIG_DVB_S5H1420=m
+CONFIG_DVB_STV0299=m
+CONFIG_DVB_TDA8083=m
CONFIG_DVB_TDA10086=m
+CONFIG_DVB_VES1X93=m
+CONFIG_DVB_TDA826X=m
+CONFIG_DVB_TUA6100=m
CONFIG_DVB_SP8870=m
CONFIG_DVB_SP887X=m
CONFIG_DVB_CX22700=m
@@ -907,13 +898,8 @@
CONFIG_DVB_BCM3510=m
CONFIG_DVB_LGDT330X=m
CONFIG_DVB_PLL=m
-CONFIG_DVB_TDA826X=m
-CONFIG_DVB_TDA827X=m
-CONFIG_DVB_TUNER_QT1010=m
-CONFIG_DVB_TUNER_MT2060=m
CONFIG_DVB_LNBP21=m
CONFIG_DVB_ISL6421=m
-CONFIG_DVB_TUA6100=m
##
## file: drivers/media/dvb/pluto2/Kconfig
@@ -952,6 +938,12 @@
##
## file: drivers/media/video/Kconfig
##
+CONFIG_VIDEO_V4L2=y
+CONFIG_VIDEO_V4L1=y
+CONFIG_VIDEO_BTCX=m
+CONFIG_VIDEO_IR=m
+CONFIG_VIDEO_TVEEPROM=m
+CONFIG_VIDEO_TUNER=m
CONFIG_VIDEO_CAPTURE_DRIVERS=y
# CONFIG_VIDEO_ADV_DEBUG is not set
CONFIG_VIDEO_HELPER_CHIPS_AUTO=y
@@ -2759,6 +2751,10 @@
##
# CONFIG_BUILD_ELF64 is not set
# CONFIG_DDB5477 is not set
+CONFIG_DVB_CORE_ATTACH=y
+CONFIG_DVB_TDA827X=m
+CONFIG_DVB_TUNER_MT2060=m
+CONFIG_DVB_TUNER_QT1010=m
CONFIG_IP_ROUTE_MULTIPATH_CACHED=y
CONFIG_IP_ROUTE_MULTIPATH_DRR=m
CONFIG_IP_ROUTE_MULTIPATH_RANDOM=m
Modified: dists/trunk/linux-2.6/debian/config/mips/config.sb1a-bcm91480b
==============================================================================
--- dists/trunk/linux-2.6/debian/config/mips/config.sb1a-bcm91480b (original)
+++ dists/trunk/linux-2.6/debian/config/mips/config.sb1a-bcm91480b Wed May 28 22:03:10 2008
@@ -153,6 +153,7 @@
##
CONFIG_ATA=m
CONFIG_SATA_AHCI=m
+CONFIG_SATA_SIL24=m
CONFIG_SATA_SVW=m
CONFIG_ATA_PIIX=m
CONFIG_SATA_MV=m
@@ -162,7 +163,6 @@
CONFIG_SATA_PROMISE=m
CONFIG_SATA_SX4=m
CONFIG_SATA_SIL=m
-CONFIG_SATA_SIL24=m
CONFIG_SATA_SIS=m
CONFIG_SATA_ULI=m
CONFIG_SATA_VIA=m
Modified: dists/trunk/linux-2.6/debian/config/mipsel/config.4kc-malta
==============================================================================
--- dists/trunk/linux-2.6/debian/config/mipsel/config.4kc-malta (original)
+++ dists/trunk/linux-2.6/debian/config/mipsel/config.4kc-malta Wed May 28 22:03:10 2008
@@ -181,6 +181,7 @@
CONFIG_ATA=y
# CONFIG_ATA_NONSTANDARD is not set
CONFIG_SATA_AHCI=y
+CONFIG_SATA_SIL24=y
# CONFIG_SATA_SVW is not set
# CONFIG_ATA_PIIX is not set
CONFIG_SATA_MV=y
@@ -190,7 +191,6 @@
CONFIG_SATA_PROMISE=y
CONFIG_SATA_SX4=y
CONFIG_SATA_SIL=y
-CONFIG_SATA_SIL24=y
# CONFIG_SATA_SIS is not set
# CONFIG_SATA_ULI is not set
# CONFIG_SATA_VIA is not set
@@ -735,13 +735,8 @@
## file: drivers/media/Kconfig
##
CONFIG_VIDEO_DEV=m
-CONFIG_VIDEO_V4L1=y
CONFIG_VIDEO_V4L1_COMPAT=y
-CONFIG_VIDEO_V4L2=y
-CONFIG_VIDEO_TUNER=m
-CONFIG_VIDEO_BTCX=m
-CONFIG_VIDEO_IR=m
-CONFIG_VIDEO_TVEEPROM=m
+CONFIG_DVB_CORE=m
##
## file: drivers/media/common/Kconfig
@@ -750,21 +745,14 @@
CONFIG_VIDEO_SAA7146_VV=m
##
-## file: drivers/media/dvb/dvb-core/Kconfig
-##
-CONFIG_DVB_CORE=m
-CONFIG_DVB_CORE_ATTACH=y
-
-##
## file: drivers/media/dvb/frontends/Kconfig
##
# CONFIG_DVB_FE_CUSTOMISE is not set
-CONFIG_DVB_PLL=m
CONFIG_DVB_TDA826X=m
-CONFIG_DVB_TUNER_MT2060=m
+CONFIG_DVB_TUA6100=m
+CONFIG_DVB_PLL=m
CONFIG_DVB_LNBP21=m
CONFIG_DVB_ISL6421=m
-CONFIG_DVB_TUA6100=m
##
## file: drivers/media/radio/Kconfig
@@ -777,6 +765,12 @@
##
## file: drivers/media/video/Kconfig
##
+CONFIG_VIDEO_V4L2=y
+CONFIG_VIDEO_V4L1=y
+CONFIG_VIDEO_BTCX=m
+CONFIG_VIDEO_IR=m
+CONFIG_VIDEO_TVEEPROM=m
+CONFIG_VIDEO_TUNER=m
# CONFIG_VIDEO_ADV_DEBUG is not set
CONFIG_VIDEO_HELPER_CHIPS_AUTO=y
CONFIG_VIDEO_TVAUDIO=m
@@ -2321,6 +2315,8 @@
## file: unknown
##
# CONFIG_DDB5477 is not set
+CONFIG_DVB_CORE_ATTACH=y
+CONFIG_DVB_TUNER_MT2060=m
CONFIG_IP_NF_TARGET_TCPMSS=m
# CONFIG_MIPS_EV64120 is not set
CONFIG_MIPS_GT64120=y
Modified: dists/trunk/linux-2.6/debian/config/mipsel/config.5kc-malta
==============================================================================
--- dists/trunk/linux-2.6/debian/config/mipsel/config.5kc-malta (original)
+++ dists/trunk/linux-2.6/debian/config/mipsel/config.5kc-malta Wed May 28 22:03:10 2008
@@ -171,6 +171,7 @@
CONFIG_ATA=y
# CONFIG_ATA_NONSTANDARD is not set
CONFIG_SATA_AHCI=y
+CONFIG_SATA_SIL24=y
# CONFIG_SATA_SVW is not set
# CONFIG_ATA_PIIX is not set
CONFIG_SATA_MV=y
@@ -180,7 +181,6 @@
CONFIG_SATA_PROMISE=y
CONFIG_SATA_SX4=y
CONFIG_SATA_SIL=y
-CONFIG_SATA_SIL24=y
# CONFIG_SATA_SIS is not set
# CONFIG_SATA_ULI is not set
# CONFIG_SATA_VIA is not set
@@ -803,13 +803,8 @@
## file: drivers/media/Kconfig
##
CONFIG_VIDEO_DEV=m
-CONFIG_VIDEO_V4L1=y
CONFIG_VIDEO_V4L1_COMPAT=y
-CONFIG_VIDEO_V4L2=y
-CONFIG_VIDEO_TUNER=m
-CONFIG_VIDEO_BTCX=m
-CONFIG_VIDEO_IR=m
-CONFIG_VIDEO_TVEEPROM=m
+CONFIG_DVB_CORE=m
##
## file: drivers/media/common/Kconfig
@@ -842,12 +837,6 @@
# CONFIG_DVB_CINERGYT2_TUNING is not set
##
-## file: drivers/media/dvb/dvb-core/Kconfig
-##
-CONFIG_DVB_CORE=m
-CONFIG_DVB_CORE_ATTACH=y
-
-##
## file: drivers/media/dvb/dvb-usb/Kconfig
##
CONFIG_DVB_USB=m
@@ -875,14 +864,16 @@
## file: drivers/media/dvb/frontends/Kconfig
##
# CONFIG_DVB_FE_CUSTOMISE is not set
-CONFIG_DVB_STV0299=m
CONFIG_DVB_CX24110=m
CONFIG_DVB_CX24123=m
-CONFIG_DVB_TDA8083=m
CONFIG_DVB_MT312=m
-CONFIG_DVB_VES1X93=m
CONFIG_DVB_S5H1420=m
+CONFIG_DVB_STV0299=m
+CONFIG_DVB_TDA8083=m
CONFIG_DVB_TDA10086=m
+CONFIG_DVB_VES1X93=m
+CONFIG_DVB_TDA826X=m
+CONFIG_DVB_TUA6100=m
CONFIG_DVB_SP8870=m
CONFIG_DVB_SP887X=m
CONFIG_DVB_CX22700=m
@@ -906,13 +897,8 @@
CONFIG_DVB_BCM3510=m
CONFIG_DVB_LGDT330X=m
CONFIG_DVB_PLL=m
-CONFIG_DVB_TDA826X=m
-CONFIG_DVB_TDA827X=m
-CONFIG_DVB_TUNER_QT1010=m
-CONFIG_DVB_TUNER_MT2060=m
CONFIG_DVB_LNBP21=m
CONFIG_DVB_ISL6421=m
-CONFIG_DVB_TUA6100=m
##
## file: drivers/media/dvb/pluto2/Kconfig
@@ -951,6 +937,12 @@
##
## file: drivers/media/video/Kconfig
##
+CONFIG_VIDEO_V4L2=y
+CONFIG_VIDEO_V4L1=y
+CONFIG_VIDEO_BTCX=m
+CONFIG_VIDEO_IR=m
+CONFIG_VIDEO_TVEEPROM=m
+CONFIG_VIDEO_TUNER=m
CONFIG_VIDEO_CAPTURE_DRIVERS=y
# CONFIG_VIDEO_ADV_DEBUG is not set
CONFIG_VIDEO_HELPER_CHIPS_AUTO=y
@@ -2745,6 +2737,10 @@
##
# CONFIG_BUILD_ELF64 is not set
# CONFIG_DDB5477 is not set
+CONFIG_DVB_CORE_ATTACH=y
+CONFIG_DVB_TDA827X=m
+CONFIG_DVB_TUNER_MT2060=m
+CONFIG_DVB_TUNER_QT1010=m
CONFIG_IP_ROUTE_MULTIPATH_CACHED=y
CONFIG_IP_ROUTE_MULTIPATH_DRR=m
CONFIG_IP_ROUTE_MULTIPATH_RANDOM=m
Modified: dists/trunk/linux-2.6/debian/config/mipsel/config.sb1-bcm91250a
==============================================================================
--- dists/trunk/linux-2.6/debian/config/mipsel/config.sb1-bcm91250a (original)
+++ dists/trunk/linux-2.6/debian/config/mipsel/config.sb1-bcm91250a Wed May 28 22:03:10 2008
@@ -156,6 +156,7 @@
##
CONFIG_ATA=m
CONFIG_SATA_AHCI=m
+CONFIG_SATA_SIL24=m
CONFIG_SATA_SVW=m
CONFIG_ATA_PIIX=m
CONFIG_SATA_MV=m
@@ -165,7 +166,6 @@
CONFIG_SATA_PROMISE=m
CONFIG_SATA_SX4=m
CONFIG_SATA_SIL=m
-CONFIG_SATA_SIL24=m
CONFIG_SATA_SIS=m
CONFIG_SATA_ULI=m
CONFIG_SATA_VIA=m
Modified: dists/trunk/linux-2.6/debian/config/mipsel/config.sb1a-bcm91480b
==============================================================================
--- dists/trunk/linux-2.6/debian/config/mipsel/config.sb1a-bcm91480b (original)
+++ dists/trunk/linux-2.6/debian/config/mipsel/config.sb1a-bcm91480b Wed May 28 22:03:10 2008
@@ -153,6 +153,7 @@
##
CONFIG_ATA=m
CONFIG_SATA_AHCI=m
+CONFIG_SATA_SIL24=m
CONFIG_SATA_SVW=m
CONFIG_ATA_PIIX=m
CONFIG_SATA_MV=m
@@ -162,7 +163,6 @@
CONFIG_SATA_PROMISE=m
CONFIG_SATA_SX4=m
CONFIG_SATA_SIL=m
-CONFIG_SATA_SIL24=m
CONFIG_SATA_SIS=m
CONFIG_SATA_ULI=m
CONFIG_SATA_VIA=m
Modified: dists/trunk/linux-2.6/debian/config/powerpc/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/powerpc/config (original)
+++ dists/trunk/linux-2.6/debian/config/powerpc/config Wed May 28 22:03:10 2008
@@ -493,7 +493,7 @@
CONFIG_PMAC_RACKMETER=m
##
-## file: drivers/media/dvb/dvb-core/Kconfig
+## file: drivers/media/Kconfig
##
CONFIG_DVB_CORE=m
Modified: dists/trunk/linux-2.6/debian/config/powerpc/config.powerpc
==============================================================================
--- dists/trunk/linux-2.6/debian/config/powerpc/config.powerpc (original)
+++ dists/trunk/linux-2.6/debian/config/powerpc/config.powerpc Wed May 28 22:03:10 2008
@@ -76,11 +76,6 @@
CONFIG_FEC_MPC52xx_MDIO=y
##
-## file: drivers/net/tulip/Kconfig
-##
-CONFIG_PCMCIA_XIRTULIP=m
-
-##
## file: drivers/serial/Kconfig
##
CONFIG_SERIAL_MPC52xx=y
Modified: dists/trunk/linux-2.6/debian/config/powerpc/config.powerpc-miboot
==============================================================================
--- dists/trunk/linux-2.6/debian/config/powerpc/config.powerpc-miboot (original)
+++ dists/trunk/linux-2.6/debian/config/powerpc/config.powerpc-miboot Wed May 28 22:03:10 2008
@@ -74,11 +74,6 @@
# CONFIG_NETPOLL_TRAP is not set
##
-## file: drivers/net/tulip/Kconfig
-##
-CONFIG_PCMCIA_XIRTULIP=m
-
-##
## file: drivers/scsi/Kconfig
##
CONFIG_CHR_DEV_SCH=m
Modified: dists/trunk/linux-2.6/debian/config/powerpc/config.powerpc64
==============================================================================
--- dists/trunk/linux-2.6/debian/config/powerpc/config.powerpc64 (original)
+++ dists/trunk/linux-2.6/debian/config/powerpc/config.powerpc64 Wed May 28 22:03:10 2008
@@ -35,12 +35,8 @@
## file: arch/powerpc/platforms/cell/Kconfig
##
# CONFIG_PPC_IBM_CELL_BLADE is not set
-CONFIG_SPU_FS=m
-
-##
-## file: arch/powerpc/platforms/celleb/Kconfig
-##
# CONFIG_PPC_CELLEB is not set
+CONFIG_SPU_FS=m
##
## file: arch/powerpc/platforms/Kconfig.cputype
Modified: dists/trunk/linux-2.6/debian/config/s390/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/s390/config (original)
+++ dists/trunk/linux-2.6/debian/config/s390/config Wed May 28 22:03:10 2008
@@ -33,8 +33,6 @@
CONFIG_APPLDATA_MEM=m
CONFIG_APPLDATA_OS=m
CONFIG_APPLDATA_NET_SUM=m
-CONFIG_NO_IDLE_HZ=y
-CONFIG_NO_IDLE_HZ_INIT=y
CONFIG_S390_HYPFS_FS=y
CONFIG_KEXEC=y
# CONFIG_ZFCPDUMP is not set
@@ -120,13 +118,11 @@
## file: drivers/s390/net/Kconfig
##
CONFIG_LCS=m
-CONFIG_CTC=m
CONFIG_NETIUCV=m
CONFIG_SMSGIUCV=m
CONFIG_CLAW=m
CONFIG_QETH=m
CONFIG_QETH_IPV6=y
-CONFIG_QETH_VLAN=y
##
## file: drivers/scsi/Kconfig
@@ -245,3 +241,11 @@
##
# CONFIG_X25 is not set
+##
+## file: unknown
+##
+CONFIG_CTC=m
+CONFIG_NO_IDLE_HZ=y
+CONFIG_NO_IDLE_HZ_INIT=y
+CONFIG_QETH_VLAN=y
+
Modified: dists/trunk/linux-2.6/debian/config/sparc/config.sparc64
==============================================================================
--- dists/trunk/linux-2.6/debian/config/sparc/config.sparc64 (original)
+++ dists/trunk/linux-2.6/debian/config/sparc/config.sparc64 Wed May 28 22:03:10 2008
@@ -13,9 +13,6 @@
# CONFIG_SPARC64_PAGE_SIZE_4MB is not set
## end choice
# CONFIG_SMP is not set
-CONFIG_SPARC32_COMPAT=y
-# CONFIG_BINFMT_AOUT32 is not set
-CONFIG_SOLARIS_EMUL=m
# CONFIG_CMDLINE_BOOL is not set
##
@@ -493,5 +490,8 @@
##
## file: unknown
##
+# CONFIG_BINFMT_AOUT32 is not set
CONFIG_BINFMT_ELF32=y
+CONFIG_SOLARIS_EMUL=m
+CONFIG_SPARC32_COMPAT=y
Modified: dists/trunk/linux-2.6/debian/config/sparc/config.sparc64-smp
==============================================================================
--- dists/trunk/linux-2.6/debian/config/sparc/config.sparc64-smp (original)
+++ dists/trunk/linux-2.6/debian/config/sparc/config.sparc64-smp Wed May 28 22:03:10 2008
@@ -14,9 +14,6 @@
## end choice
CONFIG_SMP=y
CONFIG_NR_CPUS=32
-CONFIG_SPARC32_COMPAT=y
-# CONFIG_BINFMT_AOUT32 is not set
-CONFIG_SOLARIS_EMUL=m
CONFIG_SCHED_SMT=y
# CONFIG_CMDLINE_BOOL is not set
@@ -495,5 +492,8 @@
##
## file: unknown
##
+# CONFIG_BINFMT_AOUT32 is not set
CONFIG_BINFMT_ELF32=y
+CONFIG_SOLARIS_EMUL=m
+CONFIG_SPARC32_COMPAT=y
More information about the Kernel-svn-changes
mailing list