[kernel] r18188 - in dists/trunk/linux-2.6/debian/config: . armhf kernelarch-x86 m68k mips powerpc sh4 sparc

Bastian Blank waldi at alioth.debian.org
Fri Oct 28 15:29:05 UTC 2011 

Author: waldi
Date: Fri Oct 28 15:29:03 2011
New Revision: 18188

Log:
debian/config: Automatic reorder and cleanup

Modified:
   dists/trunk/linux-2.6/debian/config/armhf/config.mx5
   dists/trunk/linux-2.6/debian/config/armhf/config.omap
   dists/trunk/linux-2.6/debian/config/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.atari
   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/powerpc/config
   dists/trunk/linux-2.6/debian/config/sh4/config
   dists/trunk/linux-2.6/debian/config/sparc/config

Modified: dists/trunk/linux-2.6/debian/config/armhf/config.mx5
==============================================================================
--- dists/trunk/linux-2.6/debian/config/armhf/config.mx5	Fri Oct 28 15:26:21 2011	(r18187)
+++ dists/trunk/linux-2.6/debian/config/armhf/config.mx5	Fri Oct 28 15:29:03 2011	(r18188)
@@ -14,13 +14,14 @@
 ##
 ## file: arch/arm/mach-mx5/Kconfig
 ##
-CONFIG_SOC_IMX51=y
 CONFIG_MACH_MX51_EFIKAMX=y
 
 ##
 ## file: arch/arm/plat-mxc/Kconfig
 ##
+## choice: Freescale CPU family:
 CONFIG_ARCH_MX51=y
+## end choice
 #. Enable PWM driver
 CONFIG_MXC_PWM=y
 
@@ -52,7 +53,6 @@
 ## file: drivers/leds/Kconfig
 ##
 CONFIG_LEDS_GPIO=y
-CONFIG_LEDS_GPIO_PLATFORM=y
 CONFIG_LEDS_TRIGGER_GPIO=y
 
 ##
@@ -156,5 +156,6 @@
 ##
 ## file: unknown
 ##
+CONFIG_LEDS_GPIO_PLATFORM=y
 CONFIG_SND_SOC_IMX_SGTL5000=m
 

Modified: dists/trunk/linux-2.6/debian/config/armhf/config.omap
==============================================================================
--- dists/trunk/linux-2.6/debian/config/armhf/config.omap	Fri Oct 28 15:26:21 2011	(r18187)
+++ dists/trunk/linux-2.6/debian/config/armhf/config.omap	Fri Oct 28 15:29:03 2011	(r18188)
@@ -43,7 +43,6 @@
 CONFIG_OMAP_DM_TIMER=y
 CONFIG_OMAP_SERIAL_WAKE=y
 ## choice: OMAP PM layer selection
-# CONFIG_OMAP_PM_NONE is not set
 CONFIG_OMAP_PM_NOOP=y
 ## end choice
 
@@ -100,7 +99,6 @@
 ##
 CONFIG_LEDS_CLASS=y
 CONFIG_LEDS_GPIO=m
-CONFIG_LEDS_GPIO_PLATFORM=y
 CONFIG_LEDS_LP5523=m
 CONFIG_LEDS_TRIGGER_GPIO=m
 
@@ -255,9 +253,6 @@
 ## choice: Platform Glue Layer
 CONFIG_USB_MUSB_OMAP2PLUS=y
 ## end choice
-## choice: Driver Mode
-CONFIG_USB_MUSB_OTG=y
-## end choice
 
 ##
 ## file: drivers/usb/otg/Kconfig
@@ -332,3 +327,10 @@
 CONFIG_SND_OMAP_SOC_RX51=m
 CONFIG_SND_OMAP_SOC_SDP4430=m
 
+##
+## file: unknown
+##
+CONFIG_LEDS_GPIO_PLATFORM=y
+# CONFIG_OMAP_PM_NONE is not set
+CONFIG_USB_MUSB_OTG=y
+

Modified: dists/trunk/linux-2.6/debian/config/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/config	Fri Oct 28 15:26:21 2011	(r18187)
+++ dists/trunk/linux-2.6/debian/config/config	Fri Oct 28 15:29:03 2011	(r18188)
@@ -324,7 +324,6 @@
 # CONFIG_DEBUG_GPIO is not set
 # CONFIG_GPIO_SYSFS is not set
 # CONFIG_GPIO_GENERIC_PLATFORM is not set
-# CONFIG_GPIO_BASIC_MMIO is not set
 # CONFIG_GPIO_IT8761E is not set
 # CONFIG_GPIO_SCH is not set
 # CONFIG_GPIO_VX855 is not set
@@ -472,7 +471,6 @@
 CONFIG_SENSORS_MAX6650=m
 CONFIG_SENSORS_NTC_THERMISTOR=m
 CONFIG_SENSORS_PC87427=m
-# CONFIG_PMBUS is not set
 # CONFIG_SENSORS_SHT15 is not set
 CONFIG_SENSORS_SHT21=m
 CONFIG_SENSORS_SMM665=m
@@ -507,6 +505,11 @@
 CONFIG_SENSORS_ATK0110=m
 
 ##
+## file: drivers/hwmon/pmbus/Kconfig
+##
+# CONFIG_PMBUS is not set
+
+##
 ## file: drivers/i2c/Kconfig
 ##
 CONFIG_I2C_COMPAT=y
@@ -1170,7 +1173,6 @@
 CONFIG_VIDEO_MXB=m
 CONFIG_VIDEO_HEXIUM_ORION=m
 CONFIG_VIDEO_HEXIUM_GEMINI=m
-CONFIG_VIDEO_CAFE_CCIC=m
 CONFIG_VIDEO_SR030PC30=m
 CONFIG_VIDEO_NOON010PC30=m
 CONFIG_SOC_CAMERA=m
@@ -1331,6 +1333,11 @@
 CONFIG_VIDEO_FB_IVTV=m
 
 ##
+## file: drivers/media/video/marvell-ccic/Kconfig
+##
+CONFIG_VIDEO_CAFE_CCIC=m
+
+##
 ## file: drivers/media/video/pvrusb2/Kconfig
 ##
 CONFIG_VIDEO_PVRUSB2=m
@@ -2690,7 +2697,6 @@
 ## file: drivers/target/loopback/Kconfig
 ##
 CONFIG_LOOPBACK_TARGET=m
-# CONFIG_LOOPBACK_TARGET_CDB_DEBUG is not set
 
 ##
 ## file: drivers/target/tcm_fc/Kconfig
@@ -3754,7 +3760,6 @@
 # CONFIG_PROVE_LOCKING is not set
 # CONFIG_SPARSE_RCU_POINTER is not set
 # CONFIG_LOCK_STAT is not set
-# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
 # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
 # CONFIG_DEBUG_KOBJECT is not set
 # CONFIG_DEBUG_HIGHMEM is not set
@@ -4614,7 +4619,9 @@
 ##
 ## file: unknown
 ##
-# CONFIG_AUFS_HINOTIFY is not set
 CONFIG_CGROUP_NS=y
+# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
+# CONFIG_GPIO_BASIC_MMIO is not set
+# CONFIG_LOOPBACK_TARGET_CDB_DEBUG is not set
 CONFIG_SMBUS=m
 

Modified: dists/trunk/linux-2.6/debian/config/kernelarch-x86/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/kernelarch-x86/config	Fri Oct 28 15:26:21 2011	(r18187)
+++ dists/trunk/linux-2.6/debian/config/kernelarch-x86/config	Fri Oct 28 15:29:03 2011	(r18188)
@@ -55,12 +55,9 @@
 # CONFIG_CMDLINE_BOOL is not set
 CONFIG_PCI=y
 CONFIG_PCI_CNB20LE_QUIRK=y
-CONFIG_DMAR=y
-# CONFIG_DMAR_DEFAULT_ON is not set
-CONFIG_INTR_REMAP=y
+# CONFIG_RAPIDIO is not set
 CONFIG_IA32_EMULATION=y
 CONFIG_IA32_AOUT=y
-# CONFIG_RAPIDIO is not set
 
 ##
 ## file: arch/x86/Kconfig.debug
@@ -612,6 +609,13 @@
 CONFIG_INPUT_TOUCHSCREEN=y
 
 ##
+## file: drivers/iommu/Kconfig
+##
+CONFIG_DMAR=y
+# CONFIG_DMAR_DEFAULT_ON is not set
+CONFIG_INTR_REMAP=y
+
+##
 ## file: drivers/isdn/Kconfig
 ##
 CONFIG_ISDN=y
@@ -1231,7 +1235,6 @@
 ## file: drivers/staging/rts_pstor/Kconfig
 ##
 CONFIG_RTS_PSTOR=m
-# RTS_PSTOR_DEBUG is not set
 
 ##
 ## file: drivers/staging/tm6000/Kconfig
@@ -1274,7 +1277,6 @@
 ## file: drivers/thermal/Kconfig
 ##
 CONFIG_THERMAL=m
-CONFIG_THERMAL_HWMON=y
 
 ##
 ## file: drivers/tty/Kconfig

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	Fri Oct 28 15:26:21 2011	(r18187)
+++ dists/trunk/linux-2.6/debian/config/kernelarch-x86/config-arch-32	Fri Oct 28 15:29:03 2011	(r18188)
@@ -139,8 +139,8 @@
 ##
 ## file: drivers/gpio/Kconfig
 ##
-CONFIG_GPIO_CS5535=m
 CONFIG_GPIO_VX855=m
+CONFIG_GPIO_CS5535=m
 
 ##
 ## file: drivers/gpu/drm/Kconfig
@@ -411,11 +411,6 @@
 CONFIG_COMEDI_POC=m
 
 ##
-## file: drivers/staging/cs5535_gpio/Kconfig
-##
-CONFIG_CS5535_GPIO=m
-
-##
 ## file: drivers/staging/olpc_dcon/Kconfig
 ##
 CONFIG_FB_OLPC_DCON=m
@@ -536,3 +531,8 @@
 ##
 CONFIG_SND_SIS7019=m
 
+##
+## file: unknown
+##
+CONFIG_CS5535_GPIO=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	Fri Oct 28 15:26:21 2011	(r18187)
+++ dists/trunk/linux-2.6/debian/config/kernelarch-x86/config-arch-64	Fri Oct 28 15:29:03 2011	(r18188)
@@ -6,8 +6,6 @@
 CONFIG_X86_X2APIC=y
 CONFIG_CALGARY_IOMMU=y
 CONFIG_CALGARY_IOMMU_ENABLED_BY_DEFAULT=y
-CONFIG_AMD_IOMMU=y
-# CONFIG_AMD_IOMMU_STATS is not set
 # CONFIG_MAXSMP is not set
 CONFIG_NR_CPUS=512
 CONFIG_NUMA=y
@@ -70,6 +68,12 @@
 CONFIG_MOUSE_PS2_TRACKPOINT=y
 
 ##
+## file: drivers/iommu/Kconfig
+##
+CONFIG_AMD_IOMMU=y
+# CONFIG_AMD_IOMMU_STATS is not set
+
+##
 ## file: drivers/macintosh/Kconfig
 ##
 CONFIG_MACINTOSH_DRIVERS=y

Modified: dists/trunk/linux-2.6/debian/config/m68k/config.atari
==============================================================================
--- dists/trunk/linux-2.6/debian/config/m68k/config.atari	Fri Oct 28 15:26:21 2011	(r18187)
+++ dists/trunk/linux-2.6/debian/config/m68k/config.atari	Fri Oct 28 15:29:03 2011	(r18188)
@@ -29,7 +29,6 @@
 CONFIG_M68KFPU_EMU=y
 CONFIG_M68KFPU_EMU_EXTRAPREC=y
 # CONFIG_M68KFPU_EMU_ONLY is not set
-CONFIG_STRAM_PROC=y
 CONFIG_HEARTBEAT=y
 
 ##
@@ -222,4 +221,5 @@
 CONFIG_ATARI_ROM_ISA=y
 CONFIG_ATARI_SCC=y
 CONFIG_ATARI_SCC_DMA=y
+CONFIG_STRAM_PROC=y
 

Modified: dists/trunk/linux-2.6/debian/config/mips/config.4kc-malta
==============================================================================
--- dists/trunk/linux-2.6/debian/config/mips/config.4kc-malta	Fri Oct 28 15:26:21 2011	(r18187)
+++ dists/trunk/linux-2.6/debian/config/mips/config.4kc-malta	Fri Oct 28 15:29:03 2011	(r18188)
@@ -80,7 +80,6 @@
 ## end choice
 # CONFIG_KEXEC is not set
 CONFIG_PCI=y
-CONFIG_VIRTUALIZATION=y
 
 ##
 ## file: arch/mips/Kconfig.debug
@@ -1194,4 +1193,5 @@
 ##
 # CONFIG_BASLER_EXCITE is not set
 # CONFIG_SCSI_SAS_LIBSAS_DEBUG is not set
+CONFIG_VIRTUALIZATION=y
 

Modified: dists/trunk/linux-2.6/debian/config/mips/config.5kc-malta
==============================================================================
--- dists/trunk/linux-2.6/debian/config/mips/config.5kc-malta	Fri Oct 28 15:26:21 2011	(r18187)
+++ dists/trunk/linux-2.6/debian/config/mips/config.5kc-malta	Fri Oct 28 15:29:03 2011	(r18188)
@@ -83,7 +83,6 @@
 CONFIG_MIPS32_COMPAT=y
 CONFIG_MIPS32_O32=y
 CONFIG_MIPS32_N32=y
-CONFIG_VIRTUALIZATION=y
 
 ##
 ## file: arch/mips/Kconfig.debug
@@ -1198,4 +1197,5 @@
 ##
 # CONFIG_BASLER_EXCITE is not set
 # CONFIG_SCSI_SAS_LIBSAS_DEBUG is not set
+CONFIG_VIRTUALIZATION=y
 

Modified: dists/trunk/linux-2.6/debian/config/powerpc/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/powerpc/config	Fri Oct 28 15:26:21 2011	(r18187)
+++ dists/trunk/linux-2.6/debian/config/powerpc/config	Fri Oct 28 15:29:03 2011	(r18188)
@@ -13,8 +13,8 @@
 CONFIG_CMDLINE="console=ttyS0,9600 console=tty0"
 CONFIG_SECCOMP=y
 CONFIG_PCI=y
-# CONFIG_ADVANCED_OPTIONS is not set
 # CONFIG_RAPIDIO is not set
+# CONFIG_ADVANCED_OPTIONS is not set
 
 ##
 ## file: arch/powerpc/Kconfig.debug
@@ -79,6 +79,7 @@
 ##
 ## file: drivers/ata/Kconfig
 ##
+CONFIG_PATA_MACIO=m
 CONFIG_PATA_NETCELL=m
 CONFIG_PATA_NS87415=m
 CONFIG_PATA_PDC2027X=m
@@ -88,7 +89,6 @@
 CONFIG_PATA_VIA=m
 CONFIG_PATA_NS87410=m
 CONFIG_PATA_PCMCIA=m
-CONFIG_PATA_MACIO=m
 
 ##
 ## file: drivers/atm/Kconfig

Modified: dists/trunk/linux-2.6/debian/config/sh4/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/sh4/config	Fri Oct 28 15:26:21 2011	(r18187)
+++ dists/trunk/linux-2.6/debian/config/sh4/config	Fri Oct 28 15:29:03 2011	(r18188)
@@ -4,7 +4,6 @@
 CONFIG_SH_CPU_FREQ=y
 CONFIG_KEXEC=y
 CONFIG_SECCOMP=y
-CONFIG_VIRTUALIZATION=y
 
 ##
 ## file: arch/sh/Kconfig.cpu
@@ -54,3 +53,8 @@
 CONFIG_PREEMPT_NONE=y
 ## end choice
 
+##
+## file: unknown
+##
+CONFIG_VIRTUALIZATION=y
+

Modified: dists/trunk/linux-2.6/debian/config/sparc/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/sparc/config	Fri Oct 28 15:26:21 2011	(r18187)
+++ dists/trunk/linux-2.6/debian/config/sparc/config	Fri Oct 28 15:29:03 2011	(r18188)
@@ -303,7 +303,6 @@
 CONFIG_SUNDANCE_MMIO=y
 CONFIG_VIA_RHINE=m
 # CONFIG_VIA_RHINE_MMIO is not set
-CONFIG_MYRI_SBUS=m
 CONFIG_FDDI=y
 CONFIG_SKFP=m
 # CONFIG_HIPPI is not set
@@ -623,3 +622,8 @@
 CONFIG_SND_SUN_CS4231=m
 CONFIG_SND_SUN_DBRI=m
 
+##
+## file: unknown
+##
+CONFIG_MYRI_SBUS=m
+

More information about the Kernel-svn-changes mailing list