[kernel] r17656 - in dists/trunk/linux-2.6/debian/config: . alpha armel ia64 kernelarch-x86 m68k mips mipsel powerpc s390 sh4 sparc

Maximilian Attems maks at alioth.debian.org
Tue Jun 14 12:13:57 UTC 2011 

Author: maks
Date: Tue Jun 14 12:13:56 2011
New Revision: 17656

Log:
update config to 3.0

arm guys may want to check their configs.

Modified:
   dists/trunk/linux-2.6/debian/config/alpha/config
   dists/trunk/linux-2.6/debian/config/armel/config
   dists/trunk/linux-2.6/debian/config/armel/config.iop32x
   dists/trunk/linux-2.6/debian/config/armel/config.ixp4xx
   dists/trunk/linux-2.6/debian/config/armel/config.kirkwood
   dists/trunk/linux-2.6/debian/config/armel/config.orion5x
   dists/trunk/linux-2.6/debian/config/armel/config.versatile
   dists/trunk/linux-2.6/debian/config/config
   dists/trunk/linux-2.6/debian/config/defines
   dists/trunk/linux-2.6/debian/config/ia64/config
   dists/trunk/linux-2.6/debian/config/kernelarch-x86/config
   dists/trunk/linux-2.6/debian/config/kernelarch-x86/config-arch-32
   dists/trunk/linux-2.6/debian/config/kernelarch-x86/config-arch-64
   dists/trunk/linux-2.6/debian/config/m68k/config
   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.octeon
   dists/trunk/linux-2.6/debian/config/mips/config.r4k-ip22
   dists/trunk/linux-2.6/debian/config/mips/config.r5k-ip32
   dists/trunk/linux-2.6/debian/config/mips/config.sb1-bcm91250a
   dists/trunk/linux-2.6/debian/config/mips/config.sb1a-bcm91480b
   dists/trunk/linux-2.6/debian/config/mipsel/config.r5k-cobalt
   dists/trunk/linux-2.6/debian/config/powerpc/config
   dists/trunk/linux-2.6/debian/config/s390/config
   dists/trunk/linux-2.6/debian/config/sh4/config.sh7751r
   dists/trunk/linux-2.6/debian/config/sh4/config.sh7785lcr
   dists/trunk/linux-2.6/debian/config/sparc/config

Modified: dists/trunk/linux-2.6/debian/config/alpha/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/alpha/config	Tue Jun 14 10:11:50 2011	(r17655)
+++ dists/trunk/linux-2.6/debian/config/alpha/config	Tue Jun 14 12:13:56 2011	(r17656)
@@ -394,7 +394,6 @@
 CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON=y
 CONFIG_ISDN_CAPI_MIDDLEWARE=y
 CONFIG_ISDN_CAPI_CAPI20=m
-CONFIG_ISDN_CAPI_CAPIFS_BOOL=y
 CONFIG_ISDN_CAPI_CAPIDRV=m
 
 ##
@@ -435,7 +434,6 @@
 CONFIG_RADIO_AZTECH=m
 CONFIG_RADIO_GEMTEK=m
 CONFIG_RADIO_MAXIRADIO=m
-CONFIG_RADIO_MAESTRO=m
 CONFIG_RADIO_SF16FMI=m
 CONFIG_RADIO_SF16FMR2=m
 CONFIG_RADIO_TERRATEC=m
@@ -469,7 +467,6 @@
 ##
 CONFIG_MTD=m
 # CONFIG_MTD_DEBUG is not set
-CONFIG_MTD_PARTITIONS=y
 CONFIG_MTD_REDBOOT_PARTS=y
 CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1
 CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED=y
@@ -1184,3 +1181,10 @@
 ##
 CONFIG_SND_HDA_INTEL=m
 
+##
+## file: unknown
+##
+CONFIG_ISDN_CAPI_CAPIFS_BOOL=y
+CONFIG_MTD_PARTITIONS=y
+CONFIG_RADIO_MAESTRO=m
+

Modified: dists/trunk/linux-2.6/debian/config/armel/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/armel/config	Tue Jun 14 10:11:50 2011	(r17655)
+++ dists/trunk/linux-2.6/debian/config/armel/config	Tue Jun 14 12:13:56 2011	(r17656)
@@ -31,7 +31,7 @@
 CONFIG_MOUSE_APPLETOUCH=m
 
 ##
-## file: drivers/input/mouse/Kconfig
+## file: drivers/input/touchscreen/Kconfig
 ##
 # CONFIG_TOUCHSCREEN_EETI is not set
 

Modified: dists/trunk/linux-2.6/debian/config/armel/config.iop32x
==============================================================================
--- dists/trunk/linux-2.6/debian/config/armel/config.iop32x	Tue Jun 14 10:11:50 2011	(r17655)
+++ dists/trunk/linux-2.6/debian/config/armel/config.iop32x	Tue Jun 14 12:13:56 2011	(r17656)
@@ -299,7 +299,6 @@
 ## file: drivers/media/radio/Kconfig
 ##
 # CONFIG_RADIO_MAXIRADIO is not set
-# CONFIG_RADIO_MAESTRO is not set
 
 ##
 ## file: drivers/message/fusion/Kconfig
@@ -326,7 +325,6 @@
 ##
 CONFIG_MTD=y
 # CONFIG_MTD_DEBUG is not set
-CONFIG_MTD_PARTITIONS=y
 CONFIG_MTD_REDBOOT_PARTS=y
 CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1
 # CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set
@@ -730,4 +728,6 @@
 ##
 # CONFIG_ARCH_AAEC2000 is not set
 # CONFIG_ARCH_LH7A40X is not set
+CONFIG_MTD_PARTITIONS=y
+# CONFIG_RADIO_MAESTRO is not set
 

Modified: dists/trunk/linux-2.6/debian/config/armel/config.ixp4xx
==============================================================================
--- dists/trunk/linux-2.6/debian/config/armel/config.ixp4xx	Tue Jun 14 10:11:50 2011	(r17655)
+++ dists/trunk/linux-2.6/debian/config/armel/config.ixp4xx	Tue Jun 14 12:13:56 2011	(r17656)
@@ -306,7 +306,6 @@
 ## file: drivers/media/radio/Kconfig
 ##
 # CONFIG_RADIO_MAXIRADIO is not set
-# CONFIG_RADIO_MAESTRO is not set
 # CONFIG_USB_DSBR is not set
 
 ##
@@ -324,7 +323,6 @@
 ##
 CONFIG_MTD=y
 # CONFIG_MTD_DEBUG is not set
-CONFIG_MTD_PARTITIONS=y
 CONFIG_MTD_REDBOOT_PARTS=y
 CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1
 # CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set
@@ -809,4 +807,6 @@
 ##
 # CONFIG_ARCH_AAEC2000 is not set
 # CONFIG_ARCH_LH7A40X is not set
+CONFIG_MTD_PARTITIONS=y
+# CONFIG_RADIO_MAESTRO is not set
 

Modified: dists/trunk/linux-2.6/debian/config/armel/config.kirkwood
==============================================================================
--- dists/trunk/linux-2.6/debian/config/armel/config.kirkwood	Tue Jun 14 10:11:50 2011	(r17655)
+++ dists/trunk/linux-2.6/debian/config/armel/config.kirkwood	Tue Jun 14 12:13:56 2011	(r17656)
@@ -22,7 +22,6 @@
 CONFIG_ARCH_KIRKWOOD=y
 # CONFIG_ARCH_ORION5X is not set
 # CONFIG_ARCH_KS8695 is not set
-# CONFIG_ARCH_NS9XXX is not set
 # CONFIG_ARCH_PNX4008 is not set
 # CONFIG_ARCH_PXA is not set
 # CONFIG_ARCH_RPC is not set
@@ -215,7 +214,6 @@
 CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON=y
 CONFIG_ISDN_CAPI_MIDDLEWARE=y
 CONFIG_ISDN_CAPI_CAPI20=m
-CONFIG_ISDN_CAPI_CAPIFS_BOOL=y
 CONFIG_ISDN_CAPI_CAPIDRV=m
 
 ##
@@ -275,7 +273,6 @@
 ##
 CONFIG_MTD=y
 # CONFIG_MTD_DEBUG is not set
-CONFIG_MTD_PARTITIONS=y
 # CONFIG_MTD_REDBOOT_PARTS is not set
 CONFIG_MTD_CMDLINE_PARTS=y
 # CONFIG_MTD_AFS_PARTS is not set
@@ -646,4 +643,7 @@
 ##
 # CONFIG_ARCH_AAEC2000 is not set
 # CONFIG_ARCH_LH7A40X is not set
+# CONFIG_ARCH_NS9XXX is not set
+CONFIG_ISDN_CAPI_CAPIFS_BOOL=y
+CONFIG_MTD_PARTITIONS=y
 

Modified: dists/trunk/linux-2.6/debian/config/armel/config.orion5x
==============================================================================
--- dists/trunk/linux-2.6/debian/config/armel/config.orion5x	Tue Jun 14 10:11:50 2011	(r17655)
+++ dists/trunk/linux-2.6/debian/config/armel/config.orion5x	Tue Jun 14 12:13:56 2011	(r17656)
@@ -21,7 +21,6 @@
 # CONFIG_ARCH_IXP4XX is not set
 CONFIG_ARCH_ORION5X=y
 # CONFIG_ARCH_KS8695 is not set
-# CONFIG_ARCH_NS9XXX is not set
 # CONFIG_ARCH_PNX4008 is not set
 # CONFIG_ARCH_PXA is not set
 # CONFIG_ARCH_RPC is not set
@@ -226,7 +225,6 @@
 CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON=y
 CONFIG_ISDN_CAPI_MIDDLEWARE=y
 CONFIG_ISDN_CAPI_CAPI20=m
-CONFIG_ISDN_CAPI_CAPIFS_BOOL=y
 CONFIG_ISDN_CAPI_CAPIDRV=m
 
 ##
@@ -271,7 +269,6 @@
 ##
 CONFIG_MTD=y
 # CONFIG_MTD_DEBUG is not set
-CONFIG_MTD_PARTITIONS=y
 # CONFIG_MTD_REDBOOT_PARTS is not set
 CONFIG_MTD_CMDLINE_PARTS=y
 # CONFIG_MTD_AFS_PARTS is not set
@@ -593,4 +590,7 @@
 ##
 # CONFIG_ARCH_AAEC2000 is not set
 # CONFIG_ARCH_LH7A40X is not set
+# CONFIG_ARCH_NS9XXX is not set
+CONFIG_ISDN_CAPI_CAPIFS_BOOL=y
+CONFIG_MTD_PARTITIONS=y
 

Modified: dists/trunk/linux-2.6/debian/config/armel/config.versatile
==============================================================================
--- dists/trunk/linux-2.6/debian/config/armel/config.versatile	Tue Jun 14 10:11:50 2011	(r17655)
+++ dists/trunk/linux-2.6/debian/config/armel/config.versatile	Tue Jun 14 12:13:56 2011	(r17656)
@@ -20,7 +20,6 @@
 # CONFIG_ARCH_IXP2000 is not set
 # CONFIG_ARCH_IXP4XX is not set
 # CONFIG_ARCH_KS8695 is not set
-# CONFIG_ARCH_NS9XXX is not set
 # CONFIG_ARCH_PNX4008 is not set
 # CONFIG_ARCH_PXA is not set
 # CONFIG_ARCH_RPC is not set
@@ -443,4 +442,5 @@
 ##
 # CONFIG_ARCH_AAEC2000 is not set
 # CONFIG_ARCH_LH7A40X is not set
+# CONFIG_ARCH_NS9XXX is not set
 

Modified: dists/trunk/linux-2.6/debian/config/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/config	Tue Jun 14 10:11:50 2011	(r17655)
+++ dists/trunk/linux-2.6/debian/config/config	Tue Jun 14 12:13:56 2011	(r17656)
@@ -96,8 +96,8 @@
 CONFIG_SATA_AHCI=m
 # CONFIG_SATA_AHCI_PLATFORM is not set
 CONFIG_SATA_INIC162X=m
-CONFIG_SATA_SIL24=m
 CONFIG_SATA_ACARD_AHCI=m
+CONFIG_SATA_SIL24=m
 CONFIG_ATA_SFF=y
 CONFIG_PDC_ADMA=m
 CONFIG_SATA_QSTOR=m
@@ -269,7 +269,6 @@
 ## file: drivers/cpufreq/Kconfig
 ##
 CONFIG_CPU_FREQ=y
-# CONFIG_CPU_FREQ_DEBUG is not set
 CONFIG_CPU_FREQ_STAT=m
 # CONFIG_CPU_FREQ_STAT_DETAILS is not set
 ## choice: Default CPUFreq governor
@@ -369,10 +368,8 @@
 CONFIG_HID_SUPPORT=y
 CONFIG_HID=m
 CONFIG_HIDRAW=y
-CONFIG_HID_3M_PCT=m
 CONFIG_HID_ACRUX=m
 CONFIG_HID_ACRUX_FF=m
-CONFIG_HID_CANDO=m
 CONFIG_HID_PRODIKEYS=m
 CONFIG_HID_DRAGONRISE=m
 CONFIG_DRAGONRISE_FF=y
@@ -389,7 +386,6 @@
 CONFIG_LOGIG940_FF=y
 CONFIG_LOGIWII_FF=y
 CONFIG_HID_MAGICMOUSE=m
-CONFIG_HID_MOSART=m
 CONFIG_HID_MULTITOUCH=m
 CONFIG_HID_NTRIG=m
 CONFIG_HID_ORTEK=m
@@ -406,7 +402,6 @@
 CONFIG_HID_ROCCAT_PYRA=m
 CONFIG_HID_SAMSUNG=m
 CONFIG_HID_SONY=m
-CONFIG_HID_STANTUM=m
 CONFIG_HID_SUNPLUS=m
 CONFIG_HID_GREENASIA=m
 CONFIG_GREENASIA_FF=y
@@ -861,8 +856,8 @@
 ## file: drivers/media/Kconfig
 ##
 CONFIG_MEDIA_SUPPORT=m
-CONFIG_VIDEO_DEV=m
 CONFIG_MEDIA_CONTROLLER=y
+CONFIG_VIDEO_DEV=m
 
 ##
 ## file: drivers/media/common/tuners/Kconfig
@@ -961,7 +956,6 @@
 CONFIG_DVB_SP887X=m
 CONFIG_DVB_CX22700=m
 CONFIG_DVB_CX22702=m
-CONFIG_DVB_DRX397XD=m
 CONFIG_DVB_L64781=m
 CONFIG_DVB_TDA1004X=m
 CONFIG_DVB_NXT6000=m
@@ -1072,8 +1066,8 @@
 CONFIG_IR_ENE=m
 CONFIG_IR_IMON=m
 CONFIG_IR_MCEUSB=m
-CONFIG_IR_REDRAT3=m
 # CONFIG_IR_NUVOTON is not set
+CONFIG_IR_REDRAT3=m
 CONFIG_IR_STREAMZAP=m
 CONFIG_RC_LOOPBACK=m
 
@@ -1103,7 +1097,6 @@
 CONFIG_VIDEO_BT819=m
 CONFIG_VIDEO_BT856=m
 CONFIG_VIDEO_KS0127=m
-CONFIG_VIDEO_OV7670=m
 CONFIG_VIDEO_SAA7110=m
 CONFIG_VIDEO_SAA711X=m
 CONFIG_VIDEO_TVP5150=m
@@ -1113,6 +1106,7 @@
 CONFIG_VIDEO_SAA7185=m
 CONFIG_VIDEO_ADV7170=m
 CONFIG_VIDEO_ADV7175=m
+CONFIG_VIDEO_OV7670=m
 CONFIG_VIDEO_UPD64031A=m
 CONFIG_VIDEO_UPD64083=m
 CONFIG_VIDEO_VIVI=m
@@ -2342,14 +2336,14 @@
 # CONFIG_AIC94XX_DEBUG is not set
 
 ##
-## file: drivers/scsi/bnx2fc/Kconfig
+## file: drivers/scsi/be2iscsi/Kconfig
 ##
-CONFIG_SCSI_BNX2X_FCOE=m
+CONFIG_BE2ISCSI=m
 
 ##
-## file: drivers/scsi/be2iscsi/Kconfig
+## file: drivers/scsi/bnx2fc/Kconfig
 ##
-CONFIG_BE2ISCSI=m
+CONFIG_SCSI_BNX2X_FCOE=m
 
 ##
 ## file: drivers/scsi/bnx2i/Kconfig
@@ -2448,7 +2442,6 @@
 ## file: drivers/staging/Kconfig
 ##
 CONFIG_STAGING=y
-# CONFIG_STAGING_EXCLUDE_BUILD is not set
 
 ##
 ## file: drivers/staging/asus_oled/Kconfig
@@ -2526,16 +2519,6 @@
 # CONFIG_USB_SERIAL_QUATECH_USB2 is not set
 
 ##
-## file: drivers/staging/rt2860/Kconfig
-##
-# CONFIG_RT2860 is not set
-
-##
-## file: drivers/staging/rt2870/Kconfig
-##
-# CONFIG_RT2870 is not set
-
-##
 ## file: drivers/staging/rtl8192e/Kconfig
 ##
 # CONFIG_RTL8192E is not set
@@ -2583,11 +2566,6 @@
 CONFIG_COMPUTONE=m
 
 ##
-## file: drivers/staging/usbip/Kconfig
-##
-# CONFIG_USB_IP_COMMON is not set
-
-##
 ## file: drivers/staging/vme/Kconfig
 ##
 # CONFIG_VME_BUS is not set
@@ -2809,7 +2787,6 @@
 CONFIG_USB_SERIAL_HP4X=m
 CONFIG_USB_SERIAL_SAFE=m
 # CONFIG_USB_SERIAL_SAFE_PADDED is not set
-CONFIG_USB_SERIAL_SAMBA=m
 CONFIG_USB_SERIAL_SIEMENS_MPI=m
 CONFIG_USB_SERIAL_SIERRAWIRELESS=m
 CONFIG_USB_SERIAL_SYMBOL=m
@@ -2890,7 +2867,9 @@
 # CONFIG_FB_UDL is not set
 CONFIG_FB_METRONOME=m
 CONFIG_FB_MB862XX=m
+## choice: GDC variant
 CONFIG_FB_MB862XX_PCI_GDC=y
+## end choice
 CONFIG_FB_MB862XX_I2C=y
 # CONFIG_FB_BROADSHEET is not set
 
@@ -3056,7 +3035,6 @@
 CONFIG_CIFS_DFS_UPCALL=y
 CONFIG_CIFS_FSCACHE=y
 CONFIG_CIFS_ACL=y
-CONFIG_CIFS_EXPERIMENTAL=y
 
 ##
 ## file: fs/coda/Kconfig
@@ -3493,7 +3471,6 @@
 CONFIG_LOG_BUF_SHIFT=17
 CONFIG_CGROUPS=y
 # CONFIG_CGROUP_DEBUG is not set
-CONFIG_CGROUP_NS=y
 CONFIG_CGROUP_FREEZER=y
 CONFIG_CGROUP_DEVICE=y
 CONFIG_CPUSETS=y
@@ -3501,7 +3478,6 @@
 CONFIG_CGROUP_CPUACCT=y
 CONFIG_RESOURCE_COUNTERS=y
 CONFIG_CGROUP_MEM_RES_CTLR=y
-CONFIG_CGROUP_MEM_RES_CTLR_DISABLED=y
 CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y
 # CONFIG_CGROUP_MEM_RES_CTLR_SWAP_ENABLED is not set
 CONFIG_CGROUP_SCHED=y
@@ -3523,7 +3499,6 @@
 CONFIG_SYSCTL_SYSCALL=y
 CONFIG_KALLSYMS=y
 # CONFIG_KALLSYMS_ALL is not set
-# CONFIG_KALLSYMS_EXTRA_PASS is not set
 CONFIG_PRINTK=y
 CONFIG_BUG=y
 CONFIG_ELF_CORE=y
@@ -3576,7 +3551,6 @@
 CONFIG_PM_STD_PARTITION=""
 CONFIG_PM_RUNTIME=y
 CONFIG_PM_DEBUG=y
-# CONFIG_PM_VERBOSE is not set
 CONFIG_PM_ADVANCED_DEBUG=y
 
 ##
@@ -3676,7 +3650,6 @@
 # CONFIG_DEBUG_CREDENTIALS is not set
 CONFIG_BOOT_PRINTK_DELAY=y
 # CONFIG_RCU_TORTURE_TEST is not set
-# CONFIG_RCU_CPU_STALL_DETECTOR is not set
 # CONFIG_KPROBES_SANITY_TEST is not set
 # CONFIG_BACKTRACE_SELF_TEST is not set
 # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
@@ -4515,32 +4488,49 @@
 # CONFIG_AUFS_RDU is not set
 # CONFIG_AUFS_SHWH is not set
 # CONFIG_AUFS_SP_IATTR is not set
+CONFIG_CGROUP_MEM_RES_CTLR_DISABLED=y
+CONFIG_CGROUP_NS=y
+CONFIG_CIFS_EXPERIMENTAL=y
+# CONFIG_CPU_FREQ_DEBUG is not set
 CONFIG_DAB=y
 # CONFIG_DEBUG_CFQ_IOSCHED is not set
 # CONFIG_DEFAULT_AS is not set
 # CONFIG_DST is not set
 # CONFIG_DT3155 is not set
+CONFIG_DVB_DRX397XD=m
+CONFIG_HID_3M_PCT=m
+CONFIG_HID_CANDO=m
+CONFIG_HID_MOSART=m
+CONFIG_HID_STANTUM=m
 # CONFIG_HW_BRANCH_TRACER is not set
 CONFIG_INOTIFY=y
 # CONFIG_INPUT_GPIO is not set
 # CONFIG_INPUT_MIMIO is not set
 CONFIG_INPUT_WINBOND_CIR=m
+# CONFIG_KALLSYMS_EXTRA_PASS is not set
 # CONFIG_KMEMTRACE is not set
 CONFIG_LBD=y
 CONFIG_MAGIC_SYSRQ_DEFAULT_MASK=0x01b6
 # CONFIG_OTUS is not set
 CONFIG_PCI_LEGACY=y
 # CONFIG_PLAN9AUTH is not set
+# CONFIG_PM_VERBOSE is not set
 # CONFIG_POCH is not set
 # CONFIG_POWER_TRACER is not set
 CONFIG_QT2160=m
+# CONFIG_RCU_CPU_STALL_DETECTOR is not set
 CONFIG_RPCSEC_GSS_SPKM3=m
+# CONFIG_RT2860 is not set
+# CONFIG_RT2870 is not set
 # CONFIG_RTL8187SE is not set
 # CONFIG_SCSI_SAS_LIBSAS_DEBUG is not set
 CONFIG_SENSORS_ADT7473=m
 # CONFIG_SLOW_WORK_DEBUG is not set
+# CONFIG_STAGING_EXCLUDE_BUILD is not set
 # CONFIG_SYSPROF_TRACER is not set
+# CONFIG_USB_IP_COMMON is not set
 # CONFIG_USB_OV511 is not set
+CONFIG_USB_SERIAL_SAMBA=m
 CONFIG_UWB_I1480U_WLP=m
 CONFIG_UWB_WLP=m
 CONFIG_WIRELESS_OLD_REGULATORY=y

Modified: dists/trunk/linux-2.6/debian/config/defines
==============================================================================
--- dists/trunk/linux-2.6/debian/config/defines	Tue Jun 14 10:11:50 2011	(r17655)
+++ dists/trunk/linux-2.6/debian/config/defines	Tue Jun 14 12:13:56 2011	(r17656)
@@ -19,7 +19,7 @@
  sh4
  sparc
  sparc64
-compiler: gcc-4.5
+compiler: gcc-4.4
 featuresets:
  none
 

Modified: dists/trunk/linux-2.6/debian/config/ia64/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/ia64/config	Tue Jun 14 10:11:50 2011	(r17655)
+++ dists/trunk/linux-2.6/debian/config/ia64/config	Tue Jun 14 12:13:56 2011	(r17656)
@@ -354,7 +354,6 @@
 ## file: drivers/media/radio/Kconfig
 ##
 CONFIG_RADIO_MAXIRADIO=m
-CONFIG_RADIO_MAESTRO=m
 CONFIG_USB_DSBR=m
 
 ##
@@ -824,4 +823,5 @@
 ## file: unknown
 ##
 CONFIG_IA32_SUPPORT=y
+CONFIG_RADIO_MAESTRO=m
 

Modified: dists/trunk/linux-2.6/debian/config/kernelarch-x86/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/kernelarch-x86/config	Tue Jun 14 10:11:50 2011	(r17655)
+++ dists/trunk/linux-2.6/debian/config/kernelarch-x86/config	Tue Jun 14 12:13:56 2011	(r17656)
@@ -67,8 +67,6 @@
 CONFIG_X86_VERBOSE_BOOTUP=y
 # CONFIG_EARLY_PRINTK_DBGP is not set
 # CONFIG_DEBUG_STACKOVERFLOW is not set
-# CONFIG_DEBUG_STACK_USAGE is not set
-# CONFIG_DEBUG_PER_CPU_MAPS is not set
 # CONFIG_X86_PTDUMP is not set
 CONFIG_DEBUG_RODATA=y
 # CONFIG_DEBUG_RODATA_TEST is not set
@@ -89,14 +87,6 @@
 # CONFIG_DEBUG_STRICT_USER_COPY_CHECKS is not set
 
 ##
-## file: arch/x86/kernel/cpu/cpufreq/Kconfig
-##
-CONFIG_X86_PCC_CPUFREQ=m
-CONFIG_X86_ACPI_CPUFREQ=m
-CONFIG_X86_SPEEDSTEP_CENTRINO=m
-# CONFIG_X86_P4_CLOCKMOD is not set
-
-##
 ## file: arch/x86/kvm/Kconfig
 ##
 CONFIG_VIRTUALIZATION=y
@@ -114,9 +104,9 @@
 ##
 ## file: crypto/Kconfig
 ##
-CONFIG_CRYPTO_AES_NI_INTEL=m
 CONFIG_CRYPTO_CRC32C_INTEL=m
 CONFIG_CRYPTO_GHASH_CLMUL_NI_INTEL=m
+CONFIG_CRYPTO_AES_NI_INTEL=m
 
 ##
 ## file: drivers/acpi/Kconfig
@@ -124,7 +114,6 @@
 CONFIG_ACPI=y
 # CONFIG_ACPI_PROCFS is not set
 # CONFIG_ACPI_PROCFS_POWER is not set
-CONFIG_ACPI_POWER_METER=m
 # CONFIG_ACPI_EC_DEBUGFS is not set
 # CONFIG_ACPI_PROC_EVENT is not set
 CONFIG_ACPI_AC=m
@@ -337,6 +326,14 @@
 ## end choice
 
 ##
+## file: drivers/cpufreq/Kconfig.x86
+##
+CONFIG_X86_PCC_CPUFREQ=m
+CONFIG_X86_ACPI_CPUFREQ=m
+CONFIG_X86_SPEEDSTEP_CENTRINO=m
+# CONFIG_X86_P4_CLOCKMOD is not set
+
+##
 ## file: drivers/cpuidle/Kconfig
 ##
 CONFIG_CPU_IDLE=y
@@ -448,7 +445,6 @@
 CONFIG_SENSORS_F71805F=m
 CONFIG_SENSORS_GL518SM=m
 CONFIG_SENSORS_GL520SM=m
-CONFIG_SENSORS_PKGTEMP=m
 CONFIG_SENSORS_IT87=m
 CONFIG_SENSORS_LM63=m
 CONFIG_SENSORS_LM75=m
@@ -621,7 +617,6 @@
 CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON=y
 CONFIG_ISDN_CAPI_MIDDLEWARE=y
 CONFIG_ISDN_CAPI_CAPI20=m
-CONFIG_ISDN_CAPI_CAPIFS_BOOL=y
 CONFIG_ISDN_CAPI_CAPIDRV=m
 
 ##
@@ -660,7 +655,6 @@
 ## file: drivers/media/radio/Kconfig
 ##
 CONFIG_RADIO_MAXIRADIO=m
-CONFIG_RADIO_MAESTRO=m
 CONFIG_USB_DSBR=m
 
 ##
@@ -704,7 +698,6 @@
 ##
 CONFIG_MTD=m
 # CONFIG_MTD_DEBUG is not set
-CONFIG_MTD_PARTITIONS=y
 CONFIG_MTD_REDBOOT_PARTS=y
 CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1
 # CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set
@@ -827,6 +820,7 @@
 CONFIG_DE600=m
 CONFIG_DE620=m
 CONFIG_XEN_NETDEV_FRONTEND=m
+CONFIG_XEN_NETDEV_BACKEND=m
 CONFIG_FDDI=y
 CONFIG_SKFP=m
 CONFIG_HIPPI=y
@@ -835,7 +829,6 @@
 CONFIG_PLIP=m
 CONFIG_NET_FC=y
 # CONFIG_NETPOLL_TRAP is not set
-CONFIG_XEN_NETDEV_BACKEND=m
 
 ##
 ## file: drivers/net/arcnet/Kconfig
@@ -1073,7 +1066,6 @@
 ##
 ## file: drivers/staging/brcm80211/Kconfig
 ##
-CONFIG_BRCM80211=m
 CONFIG_BRCMSMAC=y
 # CONFIG_BRCMFMAC is not set
 # CONFIG_BRCMDBG is not set
@@ -1412,7 +1404,9 @@
 ## file: lib/Kconfig.debug
 ##
 # CONFIG_DEBUG_SHIRQ is not set
+# CONFIG_DEBUG_STACK_USAGE is not set
 # CONFIG_FRAME_POINTER is not set
+# CONFIG_DEBUG_PER_CPU_MAPS is not set
 # CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set
 
 ##
@@ -1564,4 +1558,13 @@
 ##
 CONFIG_SND_HDA_INTEL=m
 
+##
+## file: unknown
+##
+CONFIG_ACPI_POWER_METER=m
+CONFIG_BRCM80211=m
+CONFIG_ISDN_CAPI_CAPIFS_BOOL=y
+CONFIG_MTD_PARTITIONS=y
+CONFIG_RADIO_MAESTRO=m
+CONFIG_SENSORS_PKGTEMP=m
 

Modified: dists/trunk/linux-2.6/debian/config/kernelarch-x86/config-arch-32
==============================================================================
--- dists/trunk/linux-2.6/debian/config/kernelarch-x86/config-arch-32	Tue Jun 14 10:11:50 2011	(r17655)
+++ dists/trunk/linux-2.6/debian/config/kernelarch-x86/config-arch-32	Tue Jun 14 12:13:56 2011	(r17656)
@@ -43,24 +43,6 @@
 # CONFIG_X86_PPRO_FENCE is not set
 
 ##
-## file: arch/x86/kernel/cpu/cpufreq/Kconfig
-##
-CONFIG_X86_POWERNOW_K6=m
-CONFIG_X86_POWERNOW_K7=m
-CONFIG_X86_POWERNOW_K8=m
-CONFIG_X86_GX_SUSPMOD=m
-CONFIG_X86_SPEEDSTEP_CENTRINO=m
-CONFIG_X86_SPEEDSTEP_CENTRINO_TABLE=y
-CONFIG_X86_SPEEDSTEP_ICH=m
-CONFIG_X86_SPEEDSTEP_SMI=m
-CONFIG_X86_P4_CLOCKMOD=m
-CONFIG_X86_CPUFREQ_NFORCE2=m
-CONFIG_X86_LONGRUN=m
-CONFIG_X86_LONGHAUL=m
-# CONFIG_X86_E_POWERSAVER is not set
-CONFIG_X86_SPEEDSTEP_RELAXED_CAP_CHECK=y
-
-##
 ## file: arch/x86/lguest/Kconfig
 ##
 CONFIG_LGUEST_GUEST=y
@@ -132,6 +114,24 @@
 CONFIG_AGP_EFFICEON=y
 
 ##
+## file: drivers/cpufreq/Kconfig.x86
+##
+CONFIG_X86_POWERNOW_K6=m
+CONFIG_X86_POWERNOW_K7=m
+CONFIG_X86_POWERNOW_K8=m
+CONFIG_X86_GX_SUSPMOD=m
+CONFIG_X86_SPEEDSTEP_CENTRINO=m
+CONFIG_X86_SPEEDSTEP_CENTRINO_TABLE=y
+CONFIG_X86_SPEEDSTEP_ICH=m
+CONFIG_X86_SPEEDSTEP_SMI=m
+CONFIG_X86_P4_CLOCKMOD=m
+CONFIG_X86_CPUFREQ_NFORCE2=m
+CONFIG_X86_LONGRUN=m
+CONFIG_X86_LONGHAUL=m
+# CONFIG_X86_E_POWERSAVER is not set
+CONFIG_X86_SPEEDSTEP_RELAXED_CAP_CHECK=y
+
+##
 ## file: drivers/crypto/Kconfig
 ##
 CONFIG_CRYPTO_DEV_GEODE=m

Modified: dists/trunk/linux-2.6/debian/config/kernelarch-x86/config-arch-64
==============================================================================
--- dists/trunk/linux-2.6/debian/config/kernelarch-x86/config-arch-64	Tue Jun 14 10:11:50 2011	(r17655)
+++ dists/trunk/linux-2.6/debian/config/kernelarch-x86/config-arch-64	Tue Jun 14 12:13:56 2011	(r17656)
@@ -27,11 +27,6 @@
 ## end choice
 
 ##
-## file: arch/x86/kernel/cpu/cpufreq/Kconfig
-##
-CONFIG_X86_POWERNOW_K8=m
-
-##
 ## file: crypto/Kconfig
 ##
 CONFIG_CRYPTO_AES_X86_64=m
@@ -51,6 +46,11 @@
 CONFIG_AGP_AMD64=y
 
 ##
+## file: drivers/cpufreq/Kconfig.x86
+##
+CONFIG_X86_POWERNOW_K8=m
+
+##
 ## file: drivers/i2c/busses/Kconfig
 ##
 CONFIG_I2C_STUB=m

Modified: dists/trunk/linux-2.6/debian/config/m68k/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/m68k/config	Tue Jun 14 10:11:50 2011	(r17655)
+++ dists/trunk/linux-2.6/debian/config/m68k/config	Tue Jun 14 12:13:56 2011	(r17656)
@@ -304,4 +304,3 @@
 #. TODO
 CONFIG_NET_KEY=y
 
-

Modified: dists/trunk/linux-2.6/debian/config/mips/config.4kc-malta
==============================================================================
--- dists/trunk/linux-2.6/debian/config/mips/config.4kc-malta	Tue Jun 14 10:11:50 2011	(r17655)
+++ dists/trunk/linux-2.6/debian/config/mips/config.4kc-malta	Tue Jun 14 12:13:56 2011	(r17656)
@@ -394,7 +394,6 @@
 CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON=y
 CONFIG_ISDN_CAPI_MIDDLEWARE=y
 CONFIG_ISDN_CAPI_CAPI20=m
-CONFIG_ISDN_CAPI_CAPIFS_BOOL=y
 CONFIG_ISDN_CAPI_CAPIDRV=m
 
 ##
@@ -479,7 +478,6 @@
 ##
 CONFIG_MTD=m
 # CONFIG_MTD_DEBUG is not set
-CONFIG_MTD_PARTITIONS=y
 CONFIG_MTD_REDBOOT_PARTS=y
 CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1
 # CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set
@@ -1207,5 +1205,7 @@
 ## file: unknown
 ##
 # CONFIG_BASLER_EXCITE is not set
+CONFIG_ISDN_CAPI_CAPIFS_BOOL=y
+CONFIG_MTD_PARTITIONS=y
 # CONFIG_SCSI_SAS_LIBSAS_DEBUG is not set
 

Modified: dists/trunk/linux-2.6/debian/config/mips/config.5kc-malta
==============================================================================
--- dists/trunk/linux-2.6/debian/config/mips/config.5kc-malta	Tue Jun 14 10:11:50 2011	(r17655)
+++ dists/trunk/linux-2.6/debian/config/mips/config.5kc-malta	Tue Jun 14 12:13:56 2011	(r17656)
@@ -397,7 +397,6 @@
 CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON=y
 CONFIG_ISDN_CAPI_MIDDLEWARE=y
 CONFIG_ISDN_CAPI_CAPI20=m
-CONFIG_ISDN_CAPI_CAPIFS_BOOL=y
 CONFIG_ISDN_CAPI_CAPIDRV=m
 
 ##
@@ -483,7 +482,6 @@
 ##
 CONFIG_MTD=m
 # CONFIG_MTD_DEBUG is not set
-CONFIG_MTD_PARTITIONS=y
 CONFIG_MTD_REDBOOT_PARTS=y
 CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1
 # CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set
@@ -1211,5 +1209,7 @@
 ## file: unknown
 ##
 # CONFIG_BASLER_EXCITE is not set
+CONFIG_ISDN_CAPI_CAPIFS_BOOL=y
+CONFIG_MTD_PARTITIONS=y
 # CONFIG_SCSI_SAS_LIBSAS_DEBUG is not set
 

Modified: dists/trunk/linux-2.6/debian/config/mips/config.octeon
==============================================================================
--- dists/trunk/linux-2.6/debian/config/mips/config.octeon	Tue Jun 14 10:11:50 2011	(r17655)
+++ dists/trunk/linux-2.6/debian/config/mips/config.octeon	Tue Jun 14 12:13:56 2011	(r17656)
@@ -18,7 +18,6 @@
 ##
 ## file: arch/mips/cavium-octeon/Kconfig
 ##
-CONFIG_CAVIUM_OCTEON_SPECIFIC_OPTIONS=y
 # CONFIG_CAVIUM_OCTEON_2ND_KERNEL is not set
 CONFIG_CAVIUM_OCTEON_HW_FIX_UNALIGNED=y
 CONFIG_CAVIUM_OCTEON_CVMSEG_SIZE=1
@@ -62,7 +61,6 @@
 ## file: drivers/mtd/Kconfig
 ##
 CONFIG_MTD=y
-CONFIG_MTD_PARTITIONS=y
 CONFIG_MTD_CHAR=y
 CONFIG_MTD_BLOCK=y
 
@@ -128,3 +126,9 @@
 CONFIG_SPARSEMEM_MANUAL=y
 ## end choice
 
+##
+## file: unknown
+##
+CONFIG_CAVIUM_OCTEON_SPECIFIC_OPTIONS=y
+CONFIG_MTD_PARTITIONS=y
+

Modified: dists/trunk/linux-2.6/debian/config/mips/config.r4k-ip22
==============================================================================
--- dists/trunk/linux-2.6/debian/config/mips/config.r4k-ip22	Tue Jun 14 10:11:50 2011	(r17655)
+++ dists/trunk/linux-2.6/debian/config/mips/config.r4k-ip22	Tue Jun 14 12:13:56 2011	(r17656)
@@ -260,7 +260,6 @@
 # CONFIG_RADIO_RTRACK2 is not set
 # CONFIG_RADIO_AZTECH is not set
 # CONFIG_RADIO_GEMTEK is not set
-# CONFIG_RADIO_MAESTRO is not set
 # CONFIG_RADIO_SF16FMI is not set
 # CONFIG_RADIO_SF16FMR2 is not set
 # CONFIG_RADIO_TERRATEC is not set
@@ -554,6 +553,7 @@
 ##
 # CONFIG_MIPS_ATLAS is not set
 # CONFIG_MIPS_SEAD is not set
+# CONFIG_RADIO_MAESTRO is not set
 # CONFIG_VIDEO_CPIA is not set
 # CONFIG_VIDEO_OVCAMCHIP is not set
 # CONFIG_VIDEO_SAA5246A is not set

Modified: dists/trunk/linux-2.6/debian/config/mips/config.r5k-ip32
==============================================================================
--- dists/trunk/linux-2.6/debian/config/mips/config.r5k-ip32	Tue Jun 14 10:11:50 2011	(r17655)
+++ dists/trunk/linux-2.6/debian/config/mips/config.r5k-ip32	Tue Jun 14 12:13:56 2011	(r17656)
@@ -287,7 +287,6 @@
 ## file: drivers/media/radio/Kconfig
 ##
 # CONFIG_RADIO_MAXIRADIO is not set
-# CONFIG_RADIO_MAESTRO is not set
 
 ##
 ## file: drivers/media/video/Kconfig
@@ -676,6 +675,7 @@
 CONFIG_INPUT_SGIO2_BTNS=m
 # CONFIG_MIPS_ATLAS is not set
 # CONFIG_MIPS_SEAD is not set
+# CONFIG_RADIO_MAESTRO is not set
 # CONFIG_VIDEO_CPIA is not set
 # CONFIG_VIDEO_OVCAMCHIP is not set
 # CONFIG_VIDEO_SAA5246A is not set

Modified: dists/trunk/linux-2.6/debian/config/mips/config.sb1-bcm91250a
==============================================================================
--- dists/trunk/linux-2.6/debian/config/mips/config.sb1-bcm91250a	Tue Jun 14 10:11:50 2011	(r17655)
+++ dists/trunk/linux-2.6/debian/config/mips/config.sb1-bcm91250a	Tue Jun 14 12:13:56 2011	(r17656)
@@ -344,7 +344,6 @@
 ## file: drivers/media/radio/Kconfig
 ##
 # CONFIG_RADIO_MAXIRADIO is not set
-# CONFIG_RADIO_MAESTRO is not set
 # CONFIG_USB_DSBR is not set
 
 ##
@@ -769,6 +768,7 @@
 # CONFIG_LAN_SAA9730 is not set
 # CONFIG_MIPS_ATLAS is not set
 # CONFIG_MIPS_SEAD is not set
+# CONFIG_RADIO_MAESTRO is not set
 CONFIG_SIBYTE_CFE=y
 # CONFIG_SIMULATION is not set
 

Modified: dists/trunk/linux-2.6/debian/config/mips/config.sb1a-bcm91480b
==============================================================================
--- dists/trunk/linux-2.6/debian/config/mips/config.sb1a-bcm91480b	Tue Jun 14 10:11:50 2011	(r17655)
+++ dists/trunk/linux-2.6/debian/config/mips/config.sb1a-bcm91480b	Tue Jun 14 12:13:56 2011	(r17656)
@@ -350,7 +350,6 @@
 ## file: drivers/media/radio/Kconfig
 ##
 # CONFIG_RADIO_MAXIRADIO is not set
-# CONFIG_RADIO_MAESTRO is not set
 # CONFIG_USB_DSBR is not set
 
 ##
@@ -775,5 +774,7 @@
 # CONFIG_LAN_SAA9730 is not set
 # CONFIG_MIPS_ATLAS is not set
 # CONFIG_MIPS_SEAD is not set
+# CONFIG_RADIO_MAESTRO is not set
 CONFIG_SIBYTE_CFE=y
 # CONFIG_SIMULATION is not set
+

Modified: dists/trunk/linux-2.6/debian/config/mipsel/config.r5k-cobalt
==============================================================================
--- dists/trunk/linux-2.6/debian/config/mipsel/config.r5k-cobalt	Tue Jun 14 10:11:50 2011	(r17655)
+++ dists/trunk/linux-2.6/debian/config/mipsel/config.r5k-cobalt	Tue Jun 14 12:13:56 2011	(r17656)
@@ -242,7 +242,6 @@
 CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON=y
 CONFIG_ISDN_CAPI_MIDDLEWARE=y
 CONFIG_ISDN_CAPI_CAPI20=m
-CONFIG_ISDN_CAPI_CAPIFS_BOOL=y
 
 ##
 ## file: drivers/isdn/hardware/avm/Kconfig
@@ -277,7 +276,6 @@
 ## file: drivers/media/radio/Kconfig
 ##
 # CONFIG_RADIO_MAXIRADIO is not set
-# CONFIG_RADIO_MAESTRO is not set
 # CONFIG_USB_DSBR is not set
 
 ##
@@ -329,7 +327,6 @@
 ##
 CONFIG_MTD=y
 # CONFIG_MTD_DEBUG is not set
-CONFIG_MTD_PARTITIONS=y
 # CONFIG_MTD_REDBOOT_PARTS is not set
 # CONFIG_MTD_CMDLINE_PARTS is not set
 CONFIG_MTD_CHAR=y
@@ -761,7 +758,10 @@
 ##
 ## file: unknown
 ##
+CONFIG_ISDN_CAPI_CAPIFS_BOOL=y
 # CONFIG_LAN_SAA9730 is not set
 # CONFIG_MIPS_ATLAS is not set
 # CONFIG_MIPS_SEAD is not set
+CONFIG_MTD_PARTITIONS=y
+# CONFIG_RADIO_MAESTRO is not set
 

Modified: dists/trunk/linux-2.6/debian/config/powerpc/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/powerpc/config	Tue Jun 14 10:11:50 2011	(r17655)
+++ dists/trunk/linux-2.6/debian/config/powerpc/config	Tue Jun 14 12:13:56 2011	(r17656)
@@ -19,7 +19,6 @@
 ## file: arch/powerpc/Kconfig.debug
 ##
 # CONFIG_DEBUG_STACKOVERFLOW is not set
-# CONFIG_DEBUG_STACK_USAGE is not set
 # CONFIG_CODE_PATCHING_SELFTEST is not set
 # CONFIG_FTR_FIXUP_SELFTEST is not set
 # CONFIG_MSI_BITMAP_SELFTEST is not set
@@ -366,7 +365,6 @@
 # CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON is not set
 CONFIG_ISDN_CAPI_MIDDLEWARE=y
 CONFIG_ISDN_CAPI_CAPI20=m
-# CONFIG_ISDN_CAPI_CAPIFS_BOOL is not set
 
 ##
 ## file: drivers/isdn/hardware/avm/Kconfig
@@ -426,7 +424,6 @@
 ## file: drivers/media/radio/Kconfig
 ##
 CONFIG_RADIO_MAXIRADIO=m
-CONFIG_RADIO_MAESTRO=m
 CONFIG_USB_DSBR=m
 
 ##
@@ -826,6 +823,11 @@
 CONFIG_EFI_PARTITION=y
 
 ##
+## file: lib/Kconfig.debug
+##
+# CONFIG_DEBUG_STACK_USAGE is not set
+
+##
 ## file: net/atm/Kconfig
 ##
 CONFIG_ATM=m
@@ -989,3 +991,9 @@
 CONFIG_SND_POWERMAC=m
 CONFIG_SND_POWERMAC_AUTO_DRC=y
 
+##
+## file: unknown
+##
+# CONFIG_ISDN_CAPI_CAPIFS_BOOL is not set
+CONFIG_RADIO_MAESTRO=m
+

Modified: dists/trunk/linux-2.6/debian/config/s390/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/s390/config	Tue Jun 14 10:11:50 2011	(r17655)
+++ dists/trunk/linux-2.6/debian/config/s390/config	Tue Jun 14 12:13:56 2011	(r17656)
@@ -6,7 +6,6 @@
 CONFIG_HOTPLUG_CPU=y
 CONFIG_MATHEMU=y
 CONFIG_COMPAT=y
-CONFIG_S390_EXEC_PROTECT=y
 CONFIG_PACK_STACK=y
 # CONFIG_SMALL_STACK is not set
 # CONFIG_CHECK_STACK is not set
@@ -98,7 +97,6 @@
 CONFIG_SCLP_VT220_CONSOLE=y
 CONFIG_SCLP_CPI=m
 CONFIG_S390_TAPE=m
-CONFIG_S390_TAPE_BLOCK=y
 CONFIG_S390_TAPE_34XX=m
 CONFIG_S390_TAPE_3590=m
 CONFIG_VMLOGRDR=m
@@ -193,5 +191,7 @@
 ##
 ## file: unknown
 ##
+CONFIG_S390_EXEC_PROTECT=y
+CONFIG_S390_TAPE_BLOCK=y
 # CONFIG_WARN_STACK is not set
 

Modified: dists/trunk/linux-2.6/debian/config/sh4/config.sh7751r
==============================================================================
--- dists/trunk/linux-2.6/debian/config/sh4/config.sh7751r	Tue Jun 14 10:11:50 2011	(r17655)
+++ dists/trunk/linux-2.6/debian/config/sh4/config.sh7751r	Tue Jun 14 12:13:56 2011	(r17656)
@@ -78,7 +78,6 @@
 ## file: drivers/mtd/Kconfig
 ##
 CONFIG_MTD=y
-CONFIG_MTD_PARTITIONS=y
 CONFIG_MTD_CHAR=y
 CONFIG_MTD_BLKDEVS=y
 CONFIG_MTD_BLOCK=y
@@ -209,5 +208,6 @@
 ##
 CONFIG_HAVE_MLOCK=y
 CONFIG_HAVE_MLOCKED_PAGE_BIT=y
+CONFIG_MTD_PARTITIONS=y
 CONFIG_SH_PCIDMA_NONCOHERENT=y
 

Modified: dists/trunk/linux-2.6/debian/config/sh4/config.sh7785lcr
==============================================================================
--- dists/trunk/linux-2.6/debian/config/sh4/config.sh7785lcr	Tue Jun 14 10:11:50 2011	(r17655)
+++ dists/trunk/linux-2.6/debian/config/sh4/config.sh7785lcr	Tue Jun 14 12:13:56 2011	(r17656)
@@ -122,7 +122,6 @@
 ## file: drivers/mtd/Kconfig
 ##
 CONFIG_MTD=y
-CONFIG_MTD_PARTITIONS=y
 CONFIG_MTD_CHAR=y
 CONFIG_MTD_BLKDEVS=y
 CONFIG_MTD_BLOCK=y
@@ -262,6 +261,7 @@
 ##
 CONFIG_HAVE_MLOCK=y
 CONFIG_HAVE_MLOCKED_PAGE_BIT=y
+CONFIG_MTD_PARTITIONS=y
 CONFIG_PMB_ENABLE=y
 CONFIG_PMB_FIXED=y
 CONFIG_SH_PCIDMA_NONCOHERENT=y

Modified: dists/trunk/linux-2.6/debian/config/sparc/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/sparc/config	Tue Jun 14 10:11:50 2011	(r17655)
+++ dists/trunk/linux-2.6/debian/config/sparc/config	Tue Jun 14 12:13:56 2011	(r17656)
@@ -228,7 +228,6 @@
 ## file: drivers/media/radio/Kconfig
 ##
 # CONFIG_RADIO_MAXIRADIO is not set
-# CONFIG_RADIO_MAESTRO is not set
 # CONFIG_USB_DSBR is not set
 
 ##
@@ -630,3 +629,8 @@
 CONFIG_SND_SUN_CS4231=m
 CONFIG_SND_SUN_DBRI=m
 
+##
+## file: unknown
+##
+# CONFIG_RADIO_MAESTRO is not set
+

More information about the Kernel-svn-changes mailing list