debian/config/config: Restore some options, remove options gone for good

svn path=/dists/trunk/linux/; revision=21683
This commit is contained in:
Bastian Blank 2014-08-04 15:09:18 +00:00
parent 31d8270081
commit e7a9ecec89
1 changed files with 3 additions and 41 deletions

44
debian/config/config vendored
View File

@ -455,6 +455,7 @@ CONFIG_EFI_VARS_PSTORE=m
# CONFIG_GPIO_ADP5588 is not set
# CONFIG_GPIO_CS5535 is not set
# CONFIG_GPIO_AMD8111 is not set
# CONFIG_GPIO_INTEL_MID is not set
# CONFIG_GPIO_PCH is not set
# CONFIG_GPIO_ML_IOH is not set
# CONFIG_GPIO_RDC321X is not set
@ -3085,6 +3086,7 @@ CONFIG_YENTA_TOSHIBA=y
##
# CONFIG_GENERIC_PHY is not set
# CONFIG_PHY_EXYNOS_MIPI_VIDEO is not set
# CONFIG_OMAP_CONTROL_PHY is not set
# CONFIG_OMAP_USB2 is not set
# CONFIG_TWL4030_USB is not set
# CONFIG_PHY_EXYNOS_DP_VIDEO is not set
@ -3885,6 +3887,7 @@ CONFIG_USB_MON=y
##
CONFIG_USB_SERIAL=m
CONFIG_USB_SERIAL_GENERIC=y
CONFIG_USB_SERIAL_SIMPLE=m
CONFIG_USB_SERIAL_AIRCABLE=m
CONFIG_USB_SERIAL_ARK3116=m
CONFIG_USB_SERIAL_BELKIN=m
@ -5939,44 +5942,3 @@ CONFIG_RD_XZ=y
CONFIG_RD_LZO=y
CONFIG_RD_LZ4=y
##
## file: unknown
##
# 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
# CONFIG_FB_SM7XX is not set
# CONFIG_FIREWIRE_OHCI_REMOTE_DMA is not set
# CONFIG_GPIO_LANGWELL is not set
CONFIG_IWLWIFI_P2P=y
CONFIG_M25PXX_USE_FAST_READ=y
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
CONFIG_USB_SERIAL_MOTOROLA=m
CONFIG_USB_SERIAL_SIEMENS_MPI=m
CONFIG_USB_SERIAL_SUUNTO=m
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