debian/config: Reorder config.

svn path=/dists/trunk/linux/; revision=21674
This commit is contained in:
Bastian Blank 2014-08-03 20:09:47 +00:00
parent b4b73bdf65
commit c9b147919b
12 changed files with 56 additions and 50 deletions

View File

@ -352,7 +352,6 @@ CONFIG_ISDN_CAPI=m
##
## 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 @@ CONFIG_SND_HDA_INTEL=m
##
## file: unknown
##
CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON=y
CONFIG_MTD_DOCPROBE_55AA=y
CONFIG_MTD_DOCPROBE_ADDRESS=0x0000
CONFIG_MTD_DOCPROBE_ADVANCED=y

View File

@ -213,7 +213,6 @@ CONFIG_ISDN_CAPI=m
##
## 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 @@ CONFIG_SND_KIRKWOOD_SOC_T5325=m
##
## 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

View File

@ -202,7 +202,6 @@ CONFIG_ISDN_CAPI=m
##
## 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 @@ CONFIG_ROSE=m
##
## file: unknown
##
CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON=y
# CONFIG_MTD_ALAUDA is not set
CONFIG_MTD_BLKDEVS=y

View File

@ -36,10 +36,7 @@ CONFIG_MACH_TS409=y
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 @@ CONFIG_ISDN_CAPI=m
##
## 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 @@ CONFIG_ROSE=m
##
## 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

View File

@ -36,11 +36,6 @@ CONFIG_ARCH_HIGHBANK=y
##
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_OMAP_HS=m
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_LIS3L02DQ=m
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 @@ CONFIG_SND_OMAP_SOC_OMAP3_PANDORA=m
## 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

26
debian/config/config vendored
View File

@ -2220,7 +2220,6 @@ CONFIG_CAN_SLCAN=m
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
@ -2255,6 +2254,11 @@ CONFIG_CAN_TSCAN1=m
CONFIG_CAN_SOFTING=m
CONFIG_CAN_SOFTING_CS=m
##
## file: drivers/net/can/spi/Kconfig
##
# CONFIG_CAN_MCP251X is not set
##
## file: drivers/net/can/usb/Kconfig
##
@ -2859,7 +2863,6 @@ CONFIG_WIL6210_TRACING=y
## 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
@ -3560,11 +3563,6 @@ CONFIG_USB_SN9C102=m
##
# CONFIG_R8821AE is not set
##
## file: drivers/staging/rts5139/Kconfig
##
# CONFIG_RTS5139 is not set
##
## file: drivers/staging/rts5208/Kconfig
##
@ -3771,11 +3769,11 @@ CONFIG_USB_TMC=m
##
## 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 @@ CONFIG_USB_MON=y
##
## 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_IT87_WDT=m
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_KERNEL_XZ=y
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 @@ CONFIG_TRANSPARENT_HUGEPAGE=y
## 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_RD_LZ4=y
# 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_MLX5_DEBUG=y
# 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_VIVOPAY_SERIAL=m
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

View File

@ -515,11 +515,6 @@ CONFIG_SERIAL_8250_SHARE_IRQ=y
CONFIG_USB=m
# CONFIG_USB_USS720 is not set
##
## file: drivers/usb/core/Kconfig
##
CONFIG_USB_DEBUG=y
##
## file: drivers/usb/host/Kconfig
##
@ -721,3 +716,8 @@ CONFIG_SND_HARMONY=m
##
# CONFIG_SND_HDA_INTEL is not set
##
## file: unknown
##
CONFIG_USB_DEBUG=y

View File

@ -349,7 +349,6 @@ CONFIG_ISDN_CAPI=m
##
## 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_YMFPCI=m
##
CONFIG_SND_HDA_INTEL=m
##
## file: unknown
##
CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON=y

View File

@ -18,8 +18,8 @@ CONFIG_MIPS32_N32=y
##
## 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

View File

@ -356,7 +356,6 @@ CONFIG_ISDN_CAPI=m
##
## 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_HDA_INTEL=m
CONFIG_SND_POWERMAC=m
CONFIG_SND_POWERMAC_AUTO_DRC=y
##
## file: unknown
##
# CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON is not set

View File

@ -9,7 +9,6 @@ CONFIG_MATHEMU=y
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
@ -137,11 +136,6 @@ CONFIG_ZFCP=m
##
CONFIG_HVC_IUCV=y
##
## file: drivers/watchdog/Kconfig
##
CONFIG_ZVM_WATCHDOG=m
##
## file: init/Kconfig
##
@ -187,3 +181,9 @@ CONFIG_AFIUCV=m
##
# CONFIG_LLC2 is not set
##
## file: unknown
##
# CONFIG_ZFCPDUMP is not set
CONFIG_ZVM_WATCHDOG=m

View File

@ -157,6 +157,7 @@ CONFIG_CRYPTO_AES_NI_INTEL=m
## 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 @@ CONFIG_ISDN_CAPI=m
##
## 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
@ -1472,6 +1472,11 @@ CONFIG_RTLLIB_CRYPTO_WEP=m
##
CONFIG_RTL8192E=m
##
## file: drivers/staging/rtl8192ee/Kconfig
##
CONFIG_R8192EE=m
##
## file: drivers/staging/rtl8192u/Kconfig
##
@ -1487,12 +1492,6 @@ CONFIG_R8712U=m
##
CONFIG_R8821AE=m
##
## file: drivers/staging/rts5139/Kconfig
##
CONFIG_RTS5139=m
# CONFIG_RTS5139_DEBUG is not set
##
## file: drivers/staging/rts5208/Kconfig
##
@ -1880,13 +1879,14 @@ CONFIG_SND_HDA_INTEL=m
## 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