[kernel] r21683 - dists/trunk/linux/debian/config

[Bastian Blank]

Author: waldi
Date: Mon Aug  4 15:09:18 2014
New Revision: 21683

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

Modified:
   dists/trunk/linux/debian/config/config

Modified: dists/trunk/linux/debian/config/config
==============================================================================
--- dists/trunk/linux/debian/config/config	Mon Aug  4 10:35:59 2014	(r21682)
+++ dists/trunk/linux/debian/config/config	Mon Aug  4 15:09:18 2014	(r21683)
@@ -455,6 +455,7 @@
 # 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_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_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_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
-