From 929d433e90d69353f7d710cabc8b170d9deca809 Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Mon, 24 Jun 2013 01:01:52 +0000 Subject: [PATCH] Explicitly set various config symbols to default values svn path=/dists/trunk/linux/; revision=20287 --- debian/config/config | 48 ++++++++++++++++++++++++++++- debian/config/kernelarch-x86/config | 1 + 2 files changed, 48 insertions(+), 1 deletion(-) diff --git a/debian/config/config b/debian/config/config index c92e8a6aa..aad8bcda7 100644 --- a/debian/config/config +++ b/debian/config/config @@ -220,6 +220,7 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y CONFIG_FW_LOADER=y # CONFIG_FIRMWARE_IN_KERNEL is not set CONFIG_EXTRA_FIRMWARE="" +CONFIG_FW_LOADER_USER_HELPER=y # CONFIG_DEBUG_DRIVER is not set # CONFIG_DEBUG_DEVRES is not set @@ -616,6 +617,7 @@ CONFIG_I2C_HELPER_AUTO=y ## CONFIG_I2C_ISCH=m CONFIG_I2C_NFORCE2_S4985=m +# CONFIG_I2C_CBUS_GPIO is not set # CONFIG_I2C_EG20T is not set # CONFIG_I2C_GPIO is not set # CONFIG_I2C_INTEL_MID is not set @@ -826,6 +828,7 @@ CONFIG_INPUT=y CONFIG_INPUT_FF_MEMLESS=m # CONFIG_INPUT_POLLDEV is not set CONFIG_INPUT_SPARSEKMAP=m +# CONFIG_INPUT_MATRIXKMAP is not set CONFIG_INPUT_MOUSEDEV=y CONFIG_INPUT_MOUSEDEV_PSAUX=y CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 @@ -882,8 +885,10 @@ CONFIG_KEYBOARD_QT2160=m # CONFIG_KEYBOARD_GPIO is not set # CONFIG_KEYBOARD_GPIO_POLLED is not set # CONFIG_KEYBOARD_TCA6416 is not set +# CONFIG_KEYBOARD_TCA8418 is not set # CONFIG_KEYBOARD_MATRIX is not set CONFIG_KEYBOARD_LM8323=m +# CONFIG_KEYBOARD_LM8333 is not set CONFIG_KEYBOARD_MAX7359=m # CONFIG_KEYBOARD_MCS is not set # CONFIG_KEYBOARD_MPR121 is not set @@ -926,6 +931,7 @@ CONFIG_MOUSE_SYNAPTICS_USB=m ## CONFIG_SERIO_ALTERA_PS2=m # CONFIG_SERIO_PS2MULT is not set +# CONFIG_SERIO_ARC_PS2 is not set ## ## file: drivers/input/tablet/Kconfig @@ -1766,11 +1772,13 @@ CONFIG_LPC_SCH=m CONFIG_AD525X_DPOT=m CONFIG_AD525X_DPOT_I2C=m CONFIG_AD525X_DPOT_SPI=m +# CONFIG_DUMMY_IRQ is not set # CONFIG_INTEL_MID_PTI is not set CONFIG_SGI_IOC4=m CONFIG_TIFM_CORE=m CONFIG_TIFM_7XX1=m CONFIG_ICS932S401=m +# CONFIG_ATMEL_SSC is not set CONFIG_ENCLOSURE_SERVICES=m CONFIG_SGI_XP=m CONFIG_CS5535_CLOCK_EVENT_SRC=m @@ -1789,6 +1797,7 @@ CONFIG_TI_DAC7512=m CONFIG_VMWARE_BALLOON=m # CONFIG_PCH_PHUB is not set # CONFIG_USB_SWITCH_FSA9480 is not set +# CONFIG_SRAM is not set ## ## file: drivers/misc/c2port/Kconfig @@ -2003,6 +2012,13 @@ CONFIG_CAN_KVASER_USB=m CONFIG_CAN_PEAK_USB=m CONFIG_CAN_8DEV_USB=m +## +## file: drivers/net/dsa/Kconfig +## +# CONFIG_NET_DSA_MV88E6060 is not set +# CONFIG_NET_DSA_MV88E6131 is not set +# CONFIG_NET_DSA_MV88E6123_61_65 is not set + ## ## file: drivers/net/ethernet/Kconfig ## @@ -2054,6 +2070,13 @@ CONFIG_NET_VENDOR_BROCADE=y ## CONFIG_BNA=m +## +## file: drivers/net/ethernet/cadence/Kconfig +## +CONFIG_NET_CADENCE=y +# CONFIG_ARM_AT91_ETHER is not set +# CONFIG_MACB is not set + ## ## file: drivers/net/ethernet/calxeda/Kconfig ## @@ -2109,6 +2132,11 @@ CONFIG_NET_VENDOR_EMULEX=y ## CONFIG_BE2NET=m +## +## file: drivers/net/ethernet/i825xx/Kconfig +## +CONFIG_NET_VENDOR_I825XX=y + ## ## file: drivers/net/ethernet/icplus/Kconfig ## @@ -2135,6 +2163,7 @@ CONFIG_IXGBEVF=m ## file: drivers/net/ethernet/marvell/Kconfig ## CONFIG_NET_VENDOR_MARVELL=y +# CONFIG_MVMDIO is not set CONFIG_SKGE=m # CONFIG_SKGE_DEBUG is not set CONFIG_SKGE_GENESIS=y @@ -2213,6 +2242,7 @@ CONFIG_YELLOWFIN=m CONFIG_NET_VENDOR_QLOGIC=y CONFIG_QLA3XXX=m CONFIG_QLCNIC=m +CONFIG_QLCNIC_SRIOV=y CONFIG_QLGE=m CONFIG_NETXEN_NIC=m @@ -2370,6 +2400,7 @@ CONFIG_MICREL_PHY=m # CONFIG_FIXED_PHY is not set CONFIG_MDIO_BITBANG=m # CONFIG_MDIO_GPIO is not set +# CONFIG_MICREL_KS8995MA is not set ## ## file: drivers/net/ppp/Kconfig @@ -2503,6 +2534,7 @@ CONFIG_ATH6KL=m CONFIG_ATH6KL_SDIO=m CONFIG_ATH6KL_USB=m # CONFIG_ATH6KL_DEBUG is not set +# CONFIG_ATH6KL_TRACING is not set ## ## file: drivers/net/wireless/ath/ath9k/Kconfig @@ -2512,7 +2544,7 @@ CONFIG_ATH9K=m CONFIG_ATH9K_PCI=y # CONFIG_ATH9K_AHB is not set # CONFIG_ATH9K_DEBUGFS is not set -CONFIG_ATH9K_RATE_CONTROL=y +# CONFIG_ATH9K_LEGACY_RATE_CONTROL is not set CONFIG_ATH9K_HTC=m # CONFIG_ATH9K_HTC_DEBUGFS is not set @@ -2560,6 +2592,7 @@ CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y CONFIG_BRCMSMAC=m # CONFIG_BRCMFMAC is not set # CONFIG_BRCMDBG is not set +# CONFIG_BRCM_TRACING is not set ## ## file: drivers/net/wireless/hostap/Kconfig @@ -2597,6 +2630,7 @@ CONFIG_IWLDVM=m CONFIG_IWLMVM=m # CONFIG_IWLWIFI_DEBUG is not set # CONFIG_IWLWIFI_DEVICE_TRACING is not set +CONFIG_IWLWIFI_P2P=y ## ## file: drivers/net/wireless/libertas/Kconfig @@ -3088,6 +3122,7 @@ CONFIG_SCSI_QLA_ISCSI=m ## CONFIG_SCSI_UFSHCD=m CONFIG_SCSI_UFSHCD_PCI=m +# CONFIG_SCSI_UFSHCD_PLATFORM is not set ## ## file: drivers/spi/Kconfig @@ -3278,13 +3313,16 @@ CONFIG_HVC_XEN_FRONTEND=y ## file: drivers/tty/serial/Kconfig ## CONFIG_SERIAL_MAX3100=m +# CONFIG_SERIAL_MAX310X is not set CONFIG_SERIAL_MFD_HSU=m +# CONFIG_SERIAL_SCCNXP is not set # CONFIG_SERIAL_TIMBERDALE is not set # CONFIG_SERIAL_ALTERA_JTAGUART is not set # CONFIG_SERIAL_ALTERA_UART is not set # CONFIG_SERIAL_IFX6X60 is not set # CONFIG_SERIAL_PCH_UART is not set # CONFIG_SERIAL_XILINX_PS_UART is not set +# CONFIG_SERIAL_ARC is not set CONFIG_SERIAL_RP2=m CONFIG_SERIAL_RP2_NR_UARTS=32 @@ -3298,6 +3336,7 @@ CONFIG_SERIAL_8250_FOURPORT=m CONFIG_SERIAL_8250_ACCENT=m CONFIG_SERIAL_8250_BOCA=m CONFIG_SERIAL_8250_HUB6=m +# CONFIG_SERIAL_8250_DW is not set ## ## file: drivers/uio/Kconfig @@ -3712,6 +3751,7 @@ CONFIG_BFS_FS=m ## CONFIG_BINFMT_ELF=y CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y +CONFIG_BINFMT_SCRIPT=y CONFIG_BINFMT_MISC=m ## @@ -4564,6 +4604,11 @@ CONFIG_IP_DCCP_CCID3=y ## # CONFIG_DECNET is not set +## +## file: net/dns_resolver/Kconfig +## +CONFIG_DNS_RESOLVER=m + ## ## file: net/ieee802154/Kconfig ## @@ -4734,6 +4779,7 @@ CONFIG_NF_CONNTRACK=m CONFIG_NF_CONNTRACK_MARK=y CONFIG_NF_CONNTRACK_SECMARK=y CONFIG_NF_CONNTRACK_ZONES=y +CONFIG_NF_CONNTRACK_PROCFS=y CONFIG_NF_CONNTRACK_EVENTS=y CONFIG_NF_CONNTRACK_TIMEOUT=y CONFIG_NF_CONNTRACK_TIMESTAMP=y diff --git a/debian/config/kernelarch-x86/config b/debian/config/kernelarch-x86/config index 8c64a2b82..e59d10d08 100644 --- a/debian/config/kernelarch-x86/config +++ b/debian/config/kernelarch-x86/config @@ -32,6 +32,7 @@ CONFIG_I8K=m CONFIG_MICROCODE=m CONFIG_MICROCODE_INTEL=y CONFIG_MICROCODE_AMD=y +CONFIG_MICROCODE_INTEL_EARLY=y CONFIG_X86_MSR=m CONFIG_X86_CPUID=m CONFIG_NODES_SHIFT=6