[kernel] r21674 - in dists/trunk/linux/debian/config: . alpha armel armhf hppa ia64 kernelarch-mips kernelarch-powerpc kernelarch-s390 kernelarch-x86

Bastian Blank waldi at moszumanska.debian.org
Sun Aug 3 20:09:47 UTC 2014 

Author: waldi
Date: Sun Aug  3 20:09:47 2014
New Revision: 21674

Log:
debian/config: Reorder config.

Modified:
   dists/trunk/linux/debian/config/alpha/config
   dists/trunk/linux/debian/config/armel/config.kirkwood
   dists/trunk/linux/debian/config/armel/config.mv78xx0
   dists/trunk/linux/debian/config/armel/config.orion5x
   dists/trunk/linux/debian/config/armhf/config.armmp
   dists/trunk/linux/debian/config/config
   dists/trunk/linux/debian/config/hppa/config
   dists/trunk/linux/debian/config/ia64/config
   dists/trunk/linux/debian/config/kernelarch-mips/config.octeon
   dists/trunk/linux/debian/config/kernelarch-powerpc/config
   dists/trunk/linux/debian/config/kernelarch-s390/config
   dists/trunk/linux/debian/config/kernelarch-x86/config

Modified: dists/trunk/linux/debian/config/alpha/config
==============================================================================
--- dists/trunk/linux/debian/config/alpha/config	Sun Aug  3 19:39:29 2014	(r21673)
+++ dists/trunk/linux/debian/config/alpha/config	Sun Aug  3 20:09:47 2014	(r21674)
@@ -352,7 +352,6 @@
 ##
 ## file: drivers/isdn/capi/Kconfig
 ##
-CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON=y
 CONFIG_ISDN_CAPI_CAPI20=m
 CONFIG_ISDN_CAPI_MIDDLEWARE=y
 CONFIG_ISDN_CAPI_CAPIDRV=m
@@ -1104,6 +1103,7 @@
 ##
 ## file: unknown
 ##
+CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON=y
 CONFIG_MTD_DOCPROBE_55AA=y
 CONFIG_MTD_DOCPROBE_ADDRESS=0x0000
 CONFIG_MTD_DOCPROBE_ADVANCED=y

Modified: dists/trunk/linux/debian/config/armel/config.kirkwood
==============================================================================
--- dists/trunk/linux/debian/config/armel/config.kirkwood	Sun Aug  3 19:39:29 2014	(r21673)
+++ dists/trunk/linux/debian/config/armel/config.kirkwood	Sun Aug  3 20:09:47 2014	(r21674)
@@ -213,7 +213,6 @@
 ##
 ## file: drivers/isdn/capi/Kconfig
 ##
-CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON=y
 CONFIG_ISDN_CAPI_CAPI20=m
 CONFIG_ISDN_CAPI_MIDDLEWARE=y
 CONFIG_ISDN_CAPI_CAPIDRV=m
@@ -660,6 +659,7 @@
 ##
 ## file: unknown
 ##
+CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON=y
 #. This is replaced by CONFIG_MACH_DB88F628X_BP_DT but we don't use DT here yet
 CONFIG_MACH_DB88F6281_BP=y
 CONFIG_MACH_DLINK_KIRKWOOD_DT=y

Modified: dists/trunk/linux/debian/config/armel/config.mv78xx0
==============================================================================
--- dists/trunk/linux/debian/config/armel/config.mv78xx0	Sun Aug  3 19:39:29 2014	(r21673)
+++ dists/trunk/linux/debian/config/armel/config.mv78xx0	Sun Aug  3 20:09:47 2014	(r21674)
@@ -202,7 +202,6 @@
 ##
 ## file: drivers/isdn/capi/Kconfig
 ##
-CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON=y
 CONFIG_ISDN_CAPI_CAPI20=m
 CONFIG_ISDN_CAPI_MIDDLEWARE=y
 CONFIG_ISDN_CAPI_CAPIDRV=m
@@ -551,6 +550,7 @@
 ##
 ## file: unknown
 ##
+CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON=y
 # CONFIG_MTD_ALAUDA is not set
 CONFIG_MTD_BLKDEVS=y
 

Modified: dists/trunk/linux/debian/config/armel/config.orion5x
==============================================================================
--- dists/trunk/linux/debian/config/armel/config.orion5x	Sun Aug  3 19:39:29 2014	(r21673)
+++ dists/trunk/linux/debian/config/armel/config.orion5x	Sun Aug  3 20:09:47 2014	(r21674)
@@ -36,10 +36,7 @@
 CONFIG_MACH_WRT350N_V2=y
 CONFIG_MACH_TS78XX=y
 CONFIG_MACH_MV2120=y
-CONFIG_MACH_D2NET=y
-CONFIG_MACH_BIGDISK=y
 CONFIG_MACH_NET2BIG=y
-CONFIG_MACH_MSS2=y
 CONFIG_MACH_WNR854T=y
 CONFIG_MACH_RD88F5181L_GE=y
 CONFIG_MACH_RD88F5181L_FXO=y
@@ -216,7 +213,6 @@
 ##
 ## file: drivers/isdn/capi/Kconfig
 ##
-CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON=y
 CONFIG_ISDN_CAPI_CAPI20=m
 CONFIG_ISDN_CAPI_MIDDLEWARE=y
 CONFIG_ISDN_CAPI_CAPIDRV=m
@@ -567,8 +563,12 @@
 ##
 ## file: unknown
 ##
+CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON=y
+CONFIG_MACH_BIGDISK=y
+CONFIG_MACH_D2NET=y
 #. This is replaced by CONFIG_MACH_EDMINI_V2_DT but we don't use DT here yet
 CONFIG_MACH_EDMINI_V2=y
+CONFIG_MACH_MSS2=y
 # CONFIG_MTD_ALAUDA is not set
 CONFIG_MTD_BLKDEVS=y
 

Modified: dists/trunk/linux/debian/config/armhf/config.armmp
==============================================================================
--- dists/trunk/linux/debian/config/armhf/config.armmp	Sun Aug  3 19:39:29 2014	(r21673)
+++ dists/trunk/linux/debian/config/armhf/config.armmp	Sun Aug  3 20:09:47 2014	(r21674)
@@ -36,11 +36,6 @@
 ##
 CONFIG_ARCH_MXC=y
 CONFIG_MACH_IMX51_DT=y
-CONFIG_MACH_MX51_BABBAGE=y
-CONFIG_MACH_EUKREA_CPUIMX51SD=y
-## choice: Baseboard
-CONFIG_MACH_EUKREA_MBIMXSD51_BASEBOARD=y
-## end choice
 CONFIG_SOC_IMX53=y
 CONFIG_SOC_IMX6Q=y
 
@@ -353,6 +348,7 @@
 CONFIG_MMC_MVSDIO=m
 CONFIG_MMC_SPI=m
 CONFIG_MMC_WMT=m
+CONFIG_MMC_SUNXI=m
 
 ##
 ## file: drivers/mtd/Kconfig
@@ -621,7 +617,6 @@
 CONFIG_DRM_IMX=m
 CONFIG_DRM_IMX_FB_HELPER=m
 CONFIG_DRM_IMX_LDB=m
-CONFIG_DRM_IMX_IPUV3_CORE=m
 CONFIG_DRM_IMX_IPUV3=m
 CONFIG_DRM_IMX_HDMI=m
 
@@ -805,7 +800,10 @@
 ## file: unknown
 ##
 CONFIG_AM335X_CONTROL_USB=m
-CONFIG_MMC_SUNXI=m
+CONFIG_DRM_IMX_IPUV3_CORE=m
+CONFIG_MACH_EUKREA_CPUIMX51SD=y
+CONFIG_MACH_EUKREA_MBIMXSD51_BASEBOARD=y
+CONFIG_MACH_MX51_BABBAGE=y
 CONFIG_MXC_IRQ_PRIOR=y
 CONFIG_OMAP_CONTROL_USB=m
 CONFIG_OMAP_USB3=m

Modified: dists/trunk/linux/debian/config/config
==============================================================================
--- dists/trunk/linux/debian/config/config	Sun Aug  3 19:39:29 2014	(r21673)
+++ dists/trunk/linux/debian/config/config	Sun Aug  3 20:09:47 2014	(r21674)
@@ -2220,7 +2220,6 @@
 CONFIG_CAN_DEV=m
 CONFIG_CAN_CALC_BITTIMING=y
 # CONFIG_CAN_LEDS is not set
-# CONFIG_CAN_MCP251X is not set
 # CONFIG_PCH_CAN is not set
 # CONFIG_CAN_DEBUG_DEVICES is not set
 
@@ -2256,6 +2255,11 @@
 CONFIG_CAN_SOFTING_CS=m
 
 ##
+## file: drivers/net/can/spi/Kconfig
+##
+# CONFIG_CAN_MCP251X is not set
+
+##
 ## file: drivers/net/can/usb/Kconfig
 ##
 CONFIG_CAN_EMS_USB=m
@@ -2859,7 +2863,6 @@
 ## file: drivers/net/wireless/b43/Kconfig
 ##
 CONFIG_B43=m
-CONFIG_B43_BCMA=y
 CONFIG_B43_PCMCIA=y
 CONFIG_B43_SDIO=y
 CONFIG_B43_PHY_N=y
@@ -3561,11 +3564,6 @@
 # CONFIG_R8821AE is not set
 
 ##
-## file: drivers/staging/rts5139/Kconfig
-##
-# CONFIG_RTS5139 is not set
-
-##
 ## file: drivers/staging/rts5208/Kconfig
 ##
 # CONFIG_RTS5208 is not set
@@ -3771,11 +3769,11 @@
 ##
 ## file: drivers/usb/core/Kconfig
 ##
-# CONFIG_USB_DEBUG is not set
 CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
 CONFIG_USB_DEFAULT_PERSIST=y
 CONFIG_USB_DYNAMIC_MINORS=y
 # CONFIG_USB_OTG is not set
+# CONFIG_USB_OTG_FSM is not set
 
 ##
 ## file: drivers/usb/dwc3/Kconfig
@@ -3858,11 +3856,9 @@
 ##
 ## file: drivers/usb/phy/Kconfig
 ##
-# CONFIG_USB_OTG_FSM is not set
 # CONFIG_AB8500_USB is not set
 # CONFIG_FSL_USB2_OTG is not set
 # CONFIG_ISP1301_OMAP is not set
-# CONFIG_MV_U3D_PHY is not set
 # CONFIG_NOP_USB_XCEIV is not set
 # CONFIG_AM335X_PHY_USB is not set
 # CONFIG_SAMSUNG_USB2PHY is not set
@@ -4109,8 +4105,6 @@
 CONFIG_PC87413_WDT=m
 CONFIG_SMSC_SCH311X_WDT=m
 CONFIG_SMSC37B787_WDT=m
-CONFIG_W83697HF_WDT=m
-CONFIG_W83697UG_WDT=m
 CONFIG_SBC_EPX_C3_WATCHDOG=m
 # CONFIG_MEN_A21_WDT is not set
 CONFIG_XEN_WDT=m
@@ -4683,6 +4677,7 @@
 CONFIG_SWAP=y
 CONFIG_SYSVIPC=y
 CONFIG_POSIX_MQUEUE=y
+CONFIG_CROSS_MEMORY_ATTACH=y
 CONFIG_FHANDLE=y
 CONFIG_AUDIT=y
 CONFIG_AUDITSYSCALL=y
@@ -4995,7 +4990,6 @@
 ## choice: Transparent Hugepage Support sysfs defaults
 CONFIG_TRANSPARENT_HUGEPAGE_MADVISE=y
 ## end choice
-CONFIG_CROSS_MEMORY_ATTACH=y
 # CONFIG_CLEANCACHE is not set
 # CONFIG_FRONTSWAP is not set
 # CONFIG_CMA is not set
@@ -5939,6 +5933,7 @@
 # CONFIG_ASUS_OLED is not set
 # CONFIG_ATH9K_LEGACY_RATE_CONTROL is not set
 # CONFIG_AUDIT_LOGINUID_IMMUTABLE is not set
+CONFIG_B43_BCMA=y
 # CONFIG_BCACHE_EDEBUG is not set
 # CONFIG_DEBUG_WRITECOUNT is not set
 CONFIG_DVB_USB_IT913X=m
@@ -5951,12 +5946,15 @@
 # CONFIG_MMC_UNSAFE_RESUME is not set
 CONFIG_MTD_ALAUDA=m
 CONFIG_MTD_BLKDEVS=m
+# CONFIG_MV_U3D_PHY is not set
 # CONFIG_OMAP_CONTROL_USB is not set
 # CONFIG_OMAP_USB3 is not set
 # CONFIG_R8187SE is not set
+# CONFIG_RTS5139 is not set
 # CONFIG_SCSI_AIC7XXX_OLD is not set
 # CONFIG_UIO_PDRV is not set
 CONFIG_UPROBES=y
+# CONFIG_USB_DEBUG is not set
 CONFIG_USB_SERIAL_FLASHLOADER=m
 CONFIG_USB_SERIAL_FUNSOFT=m
 CONFIG_USB_SERIAL_HP4X=m
@@ -5967,4 +5965,6 @@
 CONFIG_USB_SERIAL_ZIO=m
 # CONFIG_USB_XHCI_HCD_DEBUGGING is not set
 CONFIG_VIDEO_STK1160=m
+CONFIG_W83697HF_WDT=m
+CONFIG_W83697UG_WDT=m
 

Modified: dists/trunk/linux/debian/config/hppa/config
==============================================================================
--- dists/trunk/linux/debian/config/hppa/config	Sun Aug  3 19:39:29 2014	(r21673)
+++ dists/trunk/linux/debian/config/hppa/config	Sun Aug  3 20:09:47 2014	(r21674)
@@ -516,11 +516,6 @@
 # CONFIG_USB_USS720 is not set
 
 ##
-## file: drivers/usb/core/Kconfig
-##
-CONFIG_USB_DEBUG=y
-
-##
 ## file: drivers/usb/host/Kconfig
 ##
 CONFIG_USB_EHCI_HCD=m
@@ -721,3 +716,8 @@
 ##
 # CONFIG_SND_HDA_INTEL is not set
 
+##
+## file: unknown
+##
+CONFIG_USB_DEBUG=y
+

Modified: dists/trunk/linux/debian/config/ia64/config
==============================================================================
--- dists/trunk/linux/debian/config/ia64/config	Sun Aug  3 19:39:29 2014	(r21673)
+++ dists/trunk/linux/debian/config/ia64/config	Sun Aug  3 20:09:47 2014	(r21674)
@@ -349,7 +349,6 @@
 ##
 ## file: drivers/isdn/capi/Kconfig
 ##
-CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON=y
 CONFIG_ISDN_CAPI_CAPI20=m
 # CONFIG_ISDN_CAPI_MIDDLEWARE is not set
 
@@ -873,3 +872,8 @@
 ##
 CONFIG_SND_HDA_INTEL=m
 
+##
+## file: unknown
+##
+CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON=y
+

Modified: dists/trunk/linux/debian/config/kernelarch-mips/config.octeon
==============================================================================
--- dists/trunk/linux/debian/config/kernelarch-mips/config.octeon	Sun Aug  3 19:39:29 2014	(r21673)
+++ dists/trunk/linux/debian/config/kernelarch-mips/config.octeon	Sun Aug  3 20:09:47 2014	(r21674)
@@ -18,8 +18,8 @@
 ##
 ## file: arch/mips/cavium-octeon/Kconfig
 ##
-# CONFIG_CAVIUM_OCTEON_2ND_KERNEL is not set
 CONFIG_CAVIUM_OCTEON_CVMSEG_SIZE=1
+# CONFIG_CAVIUM_OCTEON_2ND_KERNEL is not set
 CONFIG_CAVIUM_OCTEON_LOCK_L2=y
 CONFIG_CAVIUM_OCTEON_LOCK_L2_TLB=y
 CONFIG_CAVIUM_OCTEON_LOCK_L2_EXCEPTION=y

Modified: dists/trunk/linux/debian/config/kernelarch-powerpc/config
==============================================================================
--- dists/trunk/linux/debian/config/kernelarch-powerpc/config	Sun Aug  3 19:39:29 2014	(r21673)
+++ dists/trunk/linux/debian/config/kernelarch-powerpc/config	Sun Aug  3 20:09:47 2014	(r21674)
@@ -356,7 +356,6 @@
 ##
 ## file: drivers/isdn/capi/Kconfig
 ##
-# CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON is not set
 CONFIG_ISDN_CAPI_CAPI20=m
 CONFIG_ISDN_CAPI_MIDDLEWARE=y
 
@@ -1013,3 +1012,8 @@
 CONFIG_SND_POWERMAC=m
 CONFIG_SND_POWERMAC_AUTO_DRC=y
 
+##
+## file: unknown
+##
+# CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON is not set
+

Modified: dists/trunk/linux/debian/config/kernelarch-s390/config
==============================================================================
--- dists/trunk/linux/debian/config/kernelarch-s390/config	Sun Aug  3 19:39:29 2014	(r21673)
+++ dists/trunk/linux/debian/config/kernelarch-s390/config	Sun Aug  3 20:09:47 2014	(r21674)
@@ -9,7 +9,6 @@
 CONFIG_PACK_STACK=y
 # CONFIG_CHECK_STACK is not set
 CONFIG_QDIO=y
-# CONFIG_ZFCPDUMP is not set
 CONFIG_SECCOMP=y
 CONFIG_PFAULT=y
 # CONFIG_SHARED_KERNEL is not set
@@ -138,11 +137,6 @@
 CONFIG_HVC_IUCV=y
 
 ##
-## file: drivers/watchdog/Kconfig
-##
-CONFIG_ZVM_WATCHDOG=m
-
-##
 ## file: init/Kconfig
 ##
 # CONFIG_PCI_QUIRKS is not set
@@ -187,3 +181,9 @@
 ##
 # CONFIG_LLC2 is not set
 
+##
+## file: unknown
+##
+# CONFIG_ZFCPDUMP is not set
+CONFIG_ZVM_WATCHDOG=m
+

Modified: dists/trunk/linux/debian/config/kernelarch-x86/config
==============================================================================
--- dists/trunk/linux/debian/config/kernelarch-x86/config	Sun Aug  3 19:39:29 2014	(r21673)
+++ dists/trunk/linux/debian/config/kernelarch-x86/config	Sun Aug  3 20:09:47 2014	(r21674)
@@ -157,6 +157,7 @@
 ## file: drivers/acpi/Kconfig
 ##
 CONFIG_ACPI=y
+# CONFIG_ACPI_PROCFS_POWER is not set
 # CONFIG_ACPI_EC_DEBUGFS is not set
 CONFIG_ACPI_AC=m
 CONFIG_ACPI_BATTERY=m
@@ -692,7 +693,6 @@
 ##
 ## file: drivers/isdn/capi/Kconfig
 ##
-CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON=y
 CONFIG_ISDN_CAPI_CAPI20=m
 CONFIG_ISDN_CAPI_MIDDLEWARE=y
 CONFIG_ISDN_CAPI_CAPIDRV=m
@@ -1473,6 +1473,11 @@
 CONFIG_RTL8192E=m
 
 ##
+## file: drivers/staging/rtl8192ee/Kconfig
+##
+CONFIG_R8192EE=m
+
+##
 ## file: drivers/staging/rtl8192u/Kconfig
 ##
 CONFIG_RTL8192U=m
@@ -1488,12 +1493,6 @@
 CONFIG_R8821AE=m
 
 ##
-## file: drivers/staging/rts5139/Kconfig
-##
-CONFIG_RTS5139=m
-# CONFIG_RTS5139_DEBUG is not set
-
-##
 ## file: drivers/staging/rts5208/Kconfig
 ##
 CONFIG_RTS5208=m
@@ -1880,13 +1879,14 @@
 ## file: unknown
 ##
 # CONFIG_ACPI_PROCFS is not set
-# CONFIG_ACPI_PROCFS_POWER is not set
 # CONFIG_ACPI_PROC_EVENT is not set
 CONFIG_ASUS_OLED=m
+CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON=y
 CONFIG_MTD_DOCPROBE_ADDRESS=0
 # CONFIG_MTD_DOCPROBE_ADVANCED is not set
 CONFIG_R8187SE=m
-CONFIG_R8192EE=m
+CONFIG_RTS5139=m
+# CONFIG_RTS5139_DEBUG is not set
 CONFIG_SND_HDA_I915=y
 CONFIG_VIDEO_OUTPUT_CONTROL=m

More information about the Kernel-svn-changes mailing list