[kernel] r22168 - in dists/trunk/linux/debian/config: . armel armhf kernelarch-mips kernelarch-powerpc kernelarch-x86
Ben Hutchings
benh at moszumanska.debian.org
Tue Dec 9 20:49:45 UTC 2014
Author: benh
Date: Tue Dec 9 20:49:45 2014
New Revision: 22168
Log:
Tidy config
Modified:
dists/trunk/linux/debian/config/armel/config.kirkwood
dists/trunk/linux/debian/config/armhf/config.armmp
dists/trunk/linux/debian/config/config
dists/trunk/linux/debian/config/kernelarch-mips/config.loongson-2f
dists/trunk/linux/debian/config/kernelarch-mips/config.octeon
dists/trunk/linux/debian/config/kernelarch-powerpc/config-arch-64
dists/trunk/linux/debian/config/kernelarch-x86/config
dists/trunk/linux/debian/config/kernelarch-x86/config-arch-32
Modified: dists/trunk/linux/debian/config/armel/config.kirkwood
==============================================================================
--- dists/trunk/linux/debian/config/armel/config.kirkwood Tue Dec 9 20:43:11 2014 (r22167)
+++ dists/trunk/linux/debian/config/armel/config.kirkwood Tue Dec 9 20:49:45 2014 (r22168)
@@ -1,9 +1,6 @@
##
## file: arch/arm/Kconfig
##
-## choice: ARM system type
-CONFIG_ARCH_KIRKWOOD=y
-## end choice
CONFIG_PCI=y
CONFIG_HIGHMEM=y
CONFIG_UACCESS_WITH_MEMCPY=y
@@ -26,22 +23,6 @@
# CONFIG_ARCH_MXC is not set
##
-## file: arch/arm/mach-kirkwood/Kconfig
-##
-CONFIG_MACH_D2NET_V2=y
-CONFIG_MACH_NET2BIG_V2=y
-CONFIG_MACH_NET5BIG_V2=y
-CONFIG_MACH_OPENRD_BASE=y
-CONFIG_MACH_OPENRD_CLIENT=y
-CONFIG_MACH_OPENRD_ULTIMATE=y
-CONFIG_MACH_RD88F6192_NAS=y
-CONFIG_MACH_RD88F6281=y
-CONFIG_MACH_T5325=y
-CONFIG_MACH_TS219=y
-CONFIG_MACH_TS41X=y
-CONFIG_ARCH_KIRKWOOD_DT=y
-
-##
## file: arch/arm/mm/Kconfig
##
CONFIG_ARM_THUMB=y
@@ -674,6 +655,23 @@
## file: sound/soc/kirkwood/Kconfig
##
CONFIG_SND_KIRKWOOD_SOC=m
+
+##
+## file: unknown
+##
+CONFIG_ARCH_KIRKWOOD=y
+CONFIG_ARCH_KIRKWOOD_DT=y
+CONFIG_MACH_D2NET_V2=y
+CONFIG_MACH_NET2BIG_V2=y
+CONFIG_MACH_NET5BIG_V2=y
+CONFIG_MACH_OPENRD_BASE=y
+CONFIG_MACH_OPENRD_CLIENT=y
+CONFIG_MACH_OPENRD_ULTIMATE=y
+CONFIG_MACH_RD88F6192_NAS=y
+CONFIG_MACH_RD88F6281=y
+CONFIG_MACH_T5325=y
+CONFIG_MACH_TS219=y
+CONFIG_MACH_TS41X=y
CONFIG_SND_KIRKWOOD_SOC_OPENRD=m
CONFIG_SND_KIRKWOOD_SOC_T5325=m
Modified: dists/trunk/linux/debian/config/armhf/config.armmp
==============================================================================
--- dists/trunk/linux/debian/config/armhf/config.armmp Tue Dec 9 20:43:11 2014 (r22167)
+++ dists/trunk/linux/debian/config/armhf/config.armmp Tue Dec 9 20:49:45 2014 (r22168)
@@ -43,7 +43,6 @@
## file: arch/arm/mach-imx/Kconfig
##
CONFIG_ARCH_MXC=y
-CONFIG_MACH_IMX51_DT=y
CONFIG_SOC_IMX53=y
CONFIG_SOC_IMX6Q=y
@@ -139,15 +138,14 @@
##
## file: drivers/clk/Kconfig
##
-CONFIG_CLK_TWL6040=m
CONFIG_COMMON_CLK_S2MPS11=m
+CONFIG_CLK_TWL6040=m
##
## file: drivers/cpufreq/Kconfig
##
CONFIG_CPU_FREQ=y
CONFIG_CPU_FREQ_STAT=m
-CONFIG_GENERIC_CPUFREQ_CPU0=m
##
## file: drivers/cpufreq/Kconfig.arm
@@ -211,6 +209,22 @@
CONFIG_IMX_IPUV3_CORE=m
##
+## file: drivers/hsi/Kconfig
+##
+CONFIG_HSI=m
+
+##
+## file: drivers/hsi/clients/Kconfig
+##
+CONFIG_NOKIA_MODEM=m
+CONFIG_SSI_PROTOCOL=m
+
+##
+## file: drivers/hsi/controllers/Kconfig
+##
+CONFIG_OMAP_SSI=m
+
+##
## file: drivers/hwmon/Kconfig
##
CONFIG_SENSORS_G762=m
@@ -290,7 +304,6 @@
## file: drivers/iommu/Kconfig
##
CONFIG_OMAP_IOMMU=y
-CONFIG_OMAP_IOVMM=m
# CONFIG_OMAP_IOMMU_DEBUG is not set
##
@@ -376,8 +389,6 @@
## file: drivers/mmc/host/Kconfig
##
CONFIG_MMC_ARMMMCI=m
-CONFIG_MMC_DW=m
-CONFIG_MMC_DW_EXYNOS=m
CONFIG_MMC_SDHCI=m
CONFIG_MMC_SDHCI_PLTFM=m
CONFIG_MMC_SDHCI_ESDHC_IMX=m
@@ -385,6 +396,8 @@
CONFIG_MMC_OMAP_HS=m
CONFIG_MMC_MVSDIO=m
CONFIG_MMC_SPI=m
+CONFIG_MMC_DW=m
+CONFIG_MMC_DW_EXYNOS=m
CONFIG_MMC_WMT=m
CONFIG_MMC_SUNXI=m
@@ -577,7 +590,6 @@
CONFIG_PHY_EXYNOS5250_SATA=m
CONFIG_PHY_SUN4I_USB=m
CONFIG_PHY_SAMSUNG_USB2=m
-CONFIG_PHY_EXYNOS5250_USB2=y
CONFIG_PHY_EXYNOS5_USBDRD=m
##
@@ -593,9 +605,9 @@
##
## file: drivers/power/Kconfig
##
-CONFIG_CHARGER_BQ2415X=m
CONFIG_BATTERY_BQ27x00=m
CONFIG_CHARGER_ISP1704=m
+CONFIG_CHARGER_BQ2415X=m
##
## file: drivers/power/reset/Kconfig
@@ -633,15 +645,15 @@
## file: drivers/rtc/Kconfig
##
CONFIG_RTC_DRV_ISL12057=y
+CONFIG_RTC_DRV_TWL4030=y
+CONFIG_RTC_DRV_S5M=y
CONFIG_RTC_DRV_DA9052=y
CONFIG_RTC_DRV_IMXDI=y
CONFIG_RTC_DRV_OMAP=y
CONFIG_RTC_DRV_PL030=y
CONFIG_RTC_DRV_PL031=y
CONFIG_RTC_DRV_VT8500=y
-CONFIG_RTC_DRV_S5M=y
CONFIG_RTC_DRV_SUNXI=y
-CONFIG_RTC_DRV_TWL4030=y
CONFIG_RTC_DRV_MV=y
CONFIG_RTC_DRV_MC13XXX=y
CONFIG_RTC_DRV_MXC=y
@@ -666,22 +678,6 @@
CONFIG_SPI_SPIDEV=y
##
-## file: drivers/hsi/Kconfig
-##
-CONFIG_HSI=m
-
-##
-## file: drivers/hsi/controllers/Kconfig
-##
-CONFIG_OMAP_SSI=m
-
-##
-## file: drivers/hsi/clients/Kconfig
-##
-CONFIG_NOKIA_MODEM=m
-CONFIG_SSI_PROTOCOL=m
-
-##
## file: drivers/staging/iio/accel/Kconfig
##
CONFIG_LIS3L02DQ=m
@@ -696,13 +692,6 @@
CONFIG_DRM_IMX_HDMI=m
##
-## file: drivers/staging/tidspbridge/Kconfig
-##
-CONFIG_TIDSPBRIDGE=m
-CONFIG_TIDSPBRIDGE_DVFS=y
-CONFIG_TIDSPBRIDGE_RECOVERY=y
-
-##
## file: drivers/thermal/Kconfig
##
CONFIG_ARMADA_THERMAL=y
@@ -714,6 +703,8 @@
CONFIG_SERIAL_AMBA_PL010_CONSOLE=y
CONFIG_SERIAL_AMBA_PL011=y
CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
+CONFIG_SERIAL_SAMSUNG=y
+CONFIG_SERIAL_SAMSUNG_CONSOLE=y
CONFIG_SERIAL_IMX=y
CONFIG_SERIAL_IMX_CONSOLE=y
CONFIG_SERIAL_VT8500=y
@@ -724,8 +715,6 @@
CONFIG_SERIAL_ARC=y
CONFIG_SERIAL_ARC_CONSOLE=y
CONFIG_SERIAL_ARC_NR_PORTS=1
-CONFIG_SERIAL_SAMSUNG=y
-CONFIG_SERIAL_SAMSUNG_CONSOLE=y
##
## file: drivers/tty/serial/8250/Kconfig
@@ -757,7 +746,9 @@
## file: drivers/usb/dwc3/Kconfig
##
CONFIG_USB_DWC3=m
+## choice: DWC3 Mode Selection
CONFIG_USB_DWC3_HOST=y
+## end choice
CONFIG_USB_DWC3_EXYNOS=m
# CONFIG_USB_DWC3_PCI is not set
@@ -765,24 +756,18 @@
## file: drivers/usb/gadget/Kconfig
##
CONFIG_USB_GADGET=y
-## choice: USB Gadget Drivers
-CONFIG_USB_ETH=m
-CONFIG_USB_ETH_RNDIS=y
-CONFIG_USB_GADGETFS=m
-CONFIG_USB_G_NOKIA=m
-## end choice
##
## file: drivers/usb/host/Kconfig
##
CONFIG_USB_EHCI_HCD=m
-CONFIG_USB_EHCI_EXYNOS=m
CONFIG_USB_EHCI_MXC=m
CONFIG_USB_EHCI_HCD_OMAP=y
+CONFIG_USB_EHCI_EXYNOS=m
CONFIG_USB_EHCI_HCD_PLATFORM=m
CONFIG_USB_OHCI_HCD=m
-CONFIG_USB_OHCI_EXYNOS=m
CONFIG_USB_OHCI_HCD_OMAP3=y
+CONFIG_USB_OHCI_EXYNOS=m
CONFIG_USB_OHCI_HCD_PLATFORM=m
##
@@ -825,6 +810,11 @@
CONFIG_FB_SIMPLE=y
##
+## file: drivers/video/fbdev/omap2/displays-new/Kconfig
+##
+CONFIG_DISPLAY_PANEL_SONY_ACX565AKM=m
+
+##
## file: drivers/video/fbdev/omap2/dss/Kconfig
##
CONFIG_OMAP2_DSS=m
@@ -833,11 +823,6 @@
CONFIG_OMAP2_DSS_SDI=y
##
-## file: drivers/video/fbdev/omap2/displays-new/Kconfig
-##
-CONFIG_DISPLAY_PANEL_SONY_ACX565AKM=m
-
-##
## file: drivers/video/fbdev/omap2/omapfb/Kconfig
##
CONFIG_FB_OMAP2=m
@@ -895,3 +880,18 @@
CONFIG_SND_OMAP_SOC_OMAP_HDMI=m
CONFIG_SND_OMAP_SOC_OMAP3_PANDORA=m
+##
+## file: unknown
+##
+CONFIG_GENERIC_CPUFREQ_CPU0=m
+CONFIG_MACH_IMX51_DT=y
+CONFIG_OMAP_IOVMM=m
+CONFIG_PHY_EXYNOS5250_USB2=y
+CONFIG_TIDSPBRIDGE=m
+CONFIG_TIDSPBRIDGE_DVFS=y
+CONFIG_TIDSPBRIDGE_RECOVERY=y
+CONFIG_USB_ETH=m
+CONFIG_USB_ETH_RNDIS=y
+CONFIG_USB_GADGETFS=m
+CONFIG_USB_G_NOKIA=m
+
Modified: dists/trunk/linux/debian/config/config
==============================================================================
--- dists/trunk/linux/debian/config/config Tue Dec 9 20:43:11 2014 (r22167)
+++ dists/trunk/linux/debian/config/config Tue Dec 9 20:49:45 2014 (r22168)
@@ -248,7 +248,6 @@
CONFIG_FW_LOADER=y
# CONFIG_FIRMWARE_IN_KERNEL is not set
CONFIG_EXTRA_FIRMWARE=""
-# CONFIG_FW_LOADER_USER_HELPER is not set
# CONFIG_FW_LOADER_USER_HELPER_FALLBACK is not set
CONFIG_ALLOW_DEV_COREDUMP=y
# CONFIG_DEBUG_DRIVER is not set
@@ -357,6 +356,11 @@
CONFIG_IPWIRELESS=m
##
+## file: drivers/char/xillybus/Kconfig
+##
+# CONFIG_XILLYBUS is not set
+
+##
## file: drivers/clk/Kconfig
##
# CONFIG_COMMON_CLK_SI5351 is not set
@@ -390,7 +394,6 @@
##
## file: drivers/cpuidle/Kconfig
##
-# CONFIG_CPU_IDLE_MULTIPLE_DRIVERS is not set
CONFIG_CPU_IDLE_GOV_LADDER=y
CONFIG_CPU_IDLE_GOV_MENU=y
@@ -590,7 +593,6 @@
CONFIG_HID_TWINHAN=m
CONFIG_HID_KENSINGTON=y
CONFIG_HID_LCPOWER=m
-CONFIG_HID_LENOVO_TPKBD=m
CONFIG_HID_LOGITECH=y
CONFIG_HID_LOGITECH_DJ=m
CONFIG_LOGITECH_FF=y
@@ -1189,7 +1191,6 @@
CONFIG_TABLET_USB_GTCO=m
CONFIG_TABLET_USB_HANWANG=m
CONFIG_TABLET_USB_KBTAB=m
-CONFIG_TABLET_USB_WACOM=m
##
## file: drivers/input/touchscreen/Kconfig
@@ -1700,7 +1701,6 @@
# CONFIG_VIDEO_MEM2MEM_DEINTERLACE is not set
# CONFIG_VIDEO_SH_VEU is not set
CONFIG_V4L_TEST_DRIVERS=y
-CONFIG_VIDEO_VIVI=m
# CONFIG_VIDEO_MEM2MEM_TESTDEV is not set
##
@@ -1759,11 +1759,10 @@
CONFIG_IR_RC6_DECODER=m
CONFIG_IR_JVC_DECODER=m
CONFIG_IR_SONY_DECODER=m
-CONFIG_IR_RC5_SZ_DECODER=m
CONFIG_IR_SANYO_DECODER=m
CONFIG_IR_SHARP_DECODER=m
-CONFIG_IR_XMP_DECODER=m
CONFIG_IR_MCE_KBD_DECODER=m
+CONFIG_IR_XMP_DECODER=m
CONFIG_RC_DEVICES=y
CONFIG_RC_ATI_REMOTE=m
CONFIG_IR_ENE=m
@@ -2139,7 +2138,6 @@
CONFIG_AD525X_DPOT=m
CONFIG_AD525X_DPOT_I2C=m
CONFIG_AD525X_DPOT_SPI=m
-# CONFIG_ATMEL_PWM is not set
# CONFIG_DUMMY_IRQ is not set
# CONFIG_INTEL_MID_PTI is not set
CONFIG_SGI_IOC4=m
@@ -2247,10 +2245,10 @@
## file: drivers/mtd/Kconfig
##
CONFIG_MTD=m
-CONFIG_MTD_BLOCK=m
-CONFIG_MTD_BLOCK_RO=m
# CONFIG_MTD_TESTS is not set
CONFIG_MTD_AR7_PARTS=m
+CONFIG_MTD_BLOCK=m
+CONFIG_MTD_BLOCK_RO=m
CONFIG_RFD_FTL=m
CONFIG_SSFDC=m
# CONFIG_SM_FTL is not set
@@ -2700,6 +2698,7 @@
##
## file: drivers/net/ethernet/samsung/Kconfig
+##
CONFIG_NET_VENDOR_SAMSUNG=y
# CONFIG_SXGBE_ETH is not set
@@ -2847,8 +2846,8 @@
# CONFIG_FIXED_PHY is not set
# CONFIG_MDIO_BITBANG is not set
# CONFIG_MDIO_GPIO is not set
-# CONFIG_MICREL_KS8995MA is not set
# CONFIG_MDIO_BCM_UNIMAC is not set
+# CONFIG_MICREL_KS8995MA is not set
##
## file: drivers/net/ppp/Kconfig
@@ -3386,8 +3385,8 @@
## file: drivers/rtc/Kconfig
##
CONFIG_RTC_CLASS=y
-CONFIG_RTC_SYSTOHC=y
CONFIG_RTC_HCTOSYS=y
+CONFIG_RTC_SYSTOHC=y
CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
# CONFIG_RTC_DEBUG is not set
CONFIG_RTC_INTF_SYSFS=y
@@ -3437,6 +3436,7 @@
# CONFIG_RTC_DRV_DS1511 is not set
# CONFIG_RTC_DRV_DS1553 is not set
# CONFIG_RTC_DRV_DS1742 is not set
+# CONFIG_RTC_DRV_DS2404 is not set
# CONFIG_RTC_DRV_STK17TA8 is not set
# CONFIG_RTC_DRV_M48T86 is not set
# CONFIG_RTC_DRV_M48T35 is not set
@@ -3445,7 +3445,6 @@
# CONFIG_RTC_DRV_BQ4802 is not set
# CONFIG_RTC_DRV_RP5C01 is not set
# CONFIG_RTC_DRV_V3020 is not set
-# CONFIG_RTC_DRV_DS2404 is not set
CONFIG_RTC_DRV_WM831X=m
CONFIG_RTC_DRV_WM8350=m
CONFIG_RTC_DRV_PCF50633=m
@@ -3459,7 +3458,6 @@
##
CONFIG_RAID_ATTRS=m
CONFIG_SCSI=m
-CONFIG_SCSI_TGT=m
# CONFIG_SCSI_PROC_FS is not set
CONFIG_BLK_DEV_SD=m
CONFIG_CHR_DEV_ST=m
@@ -3469,16 +3467,13 @@
CONFIG_CHR_DEV_SG=m
CONFIG_CHR_DEV_SCH=m
CONFIG_SCSI_ENCLOSURE=m
-CONFIG_SCSI_MULTI_LUN=y
CONFIG_SCSI_CONSTANTS=y
CONFIG_SCSI_LOGGING=y
CONFIG_SCSI_SCAN_ASYNC=y
CONFIG_SCSI_SPI_ATTRS=m
CONFIG_SCSI_FC_ATTRS=m
-CONFIG_SCSI_FC_TGT_ATTRS=y
CONFIG_SCSI_ISCSI_ATTRS=m
CONFIG_SCSI_SAS_ATTRS=m
-CONFIG_SCSI_SRP_TGT_ATTRS=y
CONFIG_SCSI_LOWLEVEL=y
CONFIG_ISCSI_TCP=m
CONFIG_BLK_DEV_3W_XXXX_RAID=m
@@ -3496,8 +3491,8 @@
CONFIG_SCSI_HPTIOP=m
CONFIG_VMWARE_PVSCSI=m
CONFIG_XEN_SCSI_FRONTEND=m
-CONFIG_LIBFCOE=m
CONFIG_LIBFC=m
+CONFIG_LIBFCOE=m
CONFIG_FCOE=m
CONFIG_FCOE_FNIC=m
# CONFIG_SCSI_PPA is not set
@@ -3512,7 +3507,6 @@
# CONFIG_SCSI_DEBUG is not set
CONFIG_SCSI_PMCRAID=m
CONFIG_SCSI_PM8001=m
-CONFIG_SCSI_SRP=m
CONFIG_SCSI_BFA_FC=m
CONFIG_SCSI_VIRTIO=m
@@ -3695,19 +3689,14 @@
CONFIG_STAGING=y
##
-## file: drivers/staging/bcm/Kconfig
-##
-# CONFIG_BCM_WIMAX is not set
-
-##
## file: drivers/staging/android/Kconfig
##
# CONFIG_ANDROID is not set
##
-## file: drivers/staging/ced1401/Kconfig
+## file: drivers/staging/bcm/Kconfig
##
-# CONFIG_CED1401 is not set
+# CONFIG_BCM_WIMAX is not set
##
## file: drivers/staging/comedi/Kconfig
@@ -3720,16 +3709,6 @@
# CONFIG_TOUCHSCREEN_CLEARPAD_TM1217 is not set
##
-## file: drivers/staging/cxt1e1/Kconfig
-##
-# CONFIG_CXT1E1 is not set
-
-##
-## file: drivers/staging/crystalhd/Kconfig
-##
-# CONFIG_CRYSTALHD is not set
-
-##
## file: drivers/staging/dgap/Kconfig
##
# CONFIG_DGAP is not set
@@ -3740,24 +3719,19 @@
# CONFIG_DGNC is not set
##
-## file: drivers/staging/frontier/Kconfig
-##
-# CONFIG_TRANZPORT is not set
-
-##
## file: drivers/staging/ft1000/Kconfig
##
# CONFIG_FT1000 is not set
##
-## file: drivers/staging/gdm72xx/Kconfig
+## file: drivers/staging/gdm724x/Kconfig
##
-# CONFIG_WIMAX_GDM72XX is not set
+# CONFIG_LTE_GDM724X is not set
##
-## file: drivers/staging/gdm724x/Kconfig
+## file: drivers/staging/gdm72xx/Kconfig
##
-# CONFIG_LTE_GDM724X is not set
+# CONFIG_WIMAX_GDM72XX is not set
##
## file: drivers/staging/gs_fpgaboot/Kconfig
@@ -3853,11 +3827,6 @@
# CONFIG_LINE6_USB is not set
##
-## file: drivers/staging/lirc/Kconfig
-##
-# CONFIG_LIRC_STAGING is not set
-
-##
## file: drivers/staging/lustre/lustre/Kconfig
##
# CONFIG_LUSTRE_FS is not set
@@ -3868,6 +3837,11 @@
# CONFIG_STAGING_MEDIA is not set
##
+## file: drivers/staging/media/lirc/Kconfig
+##
+# CONFIG_LIRC_STAGING is not set
+
+##
## file: drivers/staging/mt29f_spinand/Kconfig
##
# CONFIG_MTD_SPINAND_MT29F is not set
@@ -3883,16 +3857,10 @@
# CONFIG_PANEL is not set
##
-## file: drivers/staging/phison/Kconfig
-##
-# CONFIG_IDE_PHISON is not set
-
-##
## file: drivers/staging/rtl8188eu/Kconfig
##
CONFIG_R8188EU=m
CONFIG_88EU_AP_MODE=y
-CONFIG_88EU_P2P=y
##
## file: drivers/staging/rtl8192e/Kconfig
@@ -3920,41 +3888,16 @@
# CONFIG_R8723AU is not set
##
-## file: drivers/staging/rtl8821ae/Kconfig
-##
-# CONFIG_R8821AE is not set
-
-##
## file: drivers/staging/rts5208/Kconfig
##
# CONFIG_RTS5208 is not set
##
-## file: drivers/staging/sep/Kconfig
-##
-# CONFIG_DX_SEP is not set
-
-##
-## file: drivers/staging/serqt_usb2/Kconfig
-##
-# CONFIG_USB_SERIAL_QUATECH2 is not set
-
-##
-## file: drivers/staging/silicom/Kconfig
-##
-# CONFIG_NET_VENDOR_SILICOM is not set
-
-##
## file: drivers/staging/slicoss/Kconfig
##
# CONFIG_SLICOSS is not set
##
-## file: drivers/staging/sm7xxfb/Kconfig
-##
-# CONFIG_FB_SM7XX is not set
-
-##
## file: drivers/staging/speakup/Kconfig
##
CONFIG_SPEAKUP=m
@@ -3979,11 +3922,6 @@
# CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4 is not set
##
-## file: drivers/staging/usbip/Kconfig
-##
-# CONFIG_USBIP_CORE is not set
-
-##
## file: drivers/staging/vt6655/Kconfig
##
# CONFIG_VT6655 is not set
@@ -3994,11 +3932,6 @@
# CONFIG_VT6656 is not set
##
-## file: drivers/staging/winbond/Kconfig
-##
-# CONFIG_W35UND is not set
-
-##
## file: drivers/staging/wlan-ng/Kconfig
##
# CONFIG_PRISM2_USB is not set
@@ -4009,11 +3942,6 @@
# CONFIG_FB_XGI is not set
##
-## file: drivers/staging/xillybus/Kconfig
-##
-# CONFIG_XILLYBUS is not set
-
-##
## file: drivers/target/Kconfig
##
CONFIG_TARGET_CORE=m
@@ -4177,9 +4105,13 @@
# CONFIG_USB_GADGET_DEBUG is not set
# CONFIG_USB_GADGET_DEBUG_FILES is not set
# CONFIG_USB_GADGET_DEBUG_FS is not set
-# CONFIG_USB_GR_UDC is not set
CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2
+
+##
+## file: drivers/usb/gadget/udc/Kconfig
+##
# CONFIG_USB_FOTG210_UDC is not set
+# CONFIG_USB_GR_UDC is not set
# CONFIG_USB_R8A66597 is not set
# CONFIG_USB_PXA27X is not set
# CONFIG_USB_MV_UDC is not set
@@ -4189,10 +4121,6 @@
# CONFIG_USB_NET2272 is not set
CONFIG_USB_NET2280=m
# CONFIG_USB_GOKU is not set
-
-##
-## file: drivers/usb/gadget/udc/Kconfig
-##
# CONFIG_USB_DUMMY_HCD is not set
##
@@ -4276,8 +4204,6 @@
# CONFIG_ISP1301_OMAP is not set
# CONFIG_NOP_USB_XCEIV is not set
# CONFIG_AM335X_PHY_USB is not set
-# CONFIG_SAMSUNG_USB2PHY is not set
-# CONFIG_SAMSUNG_USB3PHY is not set
# CONFIG_TWL6030_USB is not set
# CONFIG_USB_GPIO_VBUS is not set
# CONFIG_USB_ISP1301 is not set
@@ -4345,7 +4271,6 @@
CONFIG_USB_SERIAL_OPTICON=m
CONFIG_USB_SERIAL_XSENS_MT=m
CONFIG_USB_SERIAL_WISHBONE=m
-CONFIG_USB_SERIAL_ZTE=m
CONFIG_USB_SERIAL_SSU100=m
CONFIG_USB_SERIAL_QT2=m
CONFIG_USB_SERIAL_DEBUG=m
@@ -4372,6 +4297,11 @@
# CONFIG_USB_UAS is not set
##
+## file: drivers/usb/usbip/Kconfig
+##
+# CONFIG_USBIP_CORE is not set
+
+##
## file: drivers/usb/wusbcore/Kconfig
##
CONFIG_USB_WUSB=m
@@ -4501,9 +4431,9 @@
##
CONFIG_W1_SLAVE_THERM=m
CONFIG_W1_SLAVE_SMEM=m
-# CONFIG_W1_SLAVE_DS2406 is not set
# CONFIG_W1_SLAVE_DS2408 is not set
# CONFIG_W1_SLAVE_DS2413 is not set
+# CONFIG_W1_SLAVE_DS2406 is not set
# CONFIG_W1_SLAVE_DS2423 is not set
CONFIG_W1_SLAVE_DS2431=m
CONFIG_W1_SLAVE_DS2433=m
@@ -5428,8 +5358,8 @@
# CONFIG_CLEANCACHE is not set
CONFIG_FRONTSWAP=y
# CONFIG_CMA is not set
-CONFIG_ZSWAP=y
CONFIG_MEM_SOFT_DIRTY=y
+CONFIG_ZSWAP=y
# CONFIG_ZBUD is not set
CONFIG_ZSMALLOC=y
# CONFIG_PGTABLE_MAPPING is not set
@@ -5556,7 +5486,6 @@
CONFIG_BRIDGE_EBT_REDIRECT=m
CONFIG_BRIDGE_EBT_SNAT=m
CONFIG_BRIDGE_EBT_LOG=m
-CONFIG_BRIDGE_EBT_ULOG=m
CONFIG_BRIDGE_EBT_NFLOG=m
##
@@ -5669,8 +5598,8 @@
# CONFIG_DEFAULT_HTCP is not set
# CONFIG_DEFAULT_VEGAS is not set
# CONFIG_DEFAULT_WESTWOOD is not set
-# CONFIG_DEFAULT_RENO is not set
# CONFIG_DEFAULT_DCTCP is not set
+# CONFIG_DEFAULT_RENO is not set
## end choice
CONFIG_TCP_MD5SIG=y
@@ -5696,7 +5625,6 @@
CONFIG_IP_NF_FILTER=m
CONFIG_IP_NF_TARGET_REJECT=m
CONFIG_IP_NF_TARGET_SYNPROXY=m
-CONFIG_IP_NF_TARGET_ULOG=m
CONFIG_IP_NF_NAT=m
CONFIG_IP_NF_TARGET_MASQUERADE=m
CONFIG_IP_NF_TARGET_NETMAP=m
@@ -5787,11 +5715,9 @@
## file: net/mac80211/Kconfig
##
CONFIG_MAC80211=m
-# CONFIG_MAC80211_RC_PID is not set
CONFIG_MAC80211_RC_MINSTREL=y
CONFIG_MAC80211_RC_MINSTREL_HT=y
## choice: Default rate control algorithm
-# CONFIG_MAC80211_RC_DEFAULT_PID is not set
CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y
## end choice
CONFIG_MAC80211_MESH=y
@@ -5944,8 +5870,8 @@
CONFIG_IP_SET_HASH_IPPORT=m
CONFIG_IP_SET_HASH_IPPORTIP=m
CONFIG_IP_SET_HASH_IPPORTNET=m
-CONFIG_IP_SET_HASH_NETPORTNET=m
CONFIG_IP_SET_HASH_MAC=m
+CONFIG_IP_SET_HASH_NETPORTNET=m
CONFIG_IP_SET_HASH_NET=m
CONFIG_IP_SET_HASH_NETNET=m
CONFIG_IP_SET_HASH_NETPORT=m
@@ -6403,3 +6329,38 @@
CONFIG_RD_LZO=y
CONFIG_RD_LZ4=y
+##
+## file: unknown
+##
+CONFIG_88EU_P2P=y
+# CONFIG_ATMEL_PWM is not set
+CONFIG_BRIDGE_EBT_ULOG=m
+# CONFIG_CED1401 is not set
+# CONFIG_CPU_IDLE_MULTIPLE_DRIVERS is not set
+# CONFIG_CRYSTALHD is not set
+# CONFIG_CXT1E1 is not set
+# CONFIG_DX_SEP is not set
+# CONFIG_FB_SM7XX is not set
+# CONFIG_FW_LOADER_USER_HELPER is not set
+CONFIG_HID_LENOVO_TPKBD=m
+# CONFIG_IDE_PHISON is not set
+CONFIG_IP_NF_TARGET_ULOG=m
+CONFIG_IR_RC5_SZ_DECODER=m
+# CONFIG_MAC80211_RC_DEFAULT_PID is not set
+# CONFIG_MAC80211_RC_PID is not set
+# CONFIG_NET_VENDOR_SILICOM is not set
+# CONFIG_R8821AE is not set
+# CONFIG_SAMSUNG_USB2PHY is not set
+# CONFIG_SAMSUNG_USB3PHY is not set
+CONFIG_SCSI_FC_TGT_ATTRS=y
+CONFIG_SCSI_MULTI_LUN=y
+CONFIG_SCSI_SRP=m
+CONFIG_SCSI_SRP_TGT_ATTRS=y
+CONFIG_SCSI_TGT=m
+CONFIG_TABLET_USB_WACOM=m
+# CONFIG_TRANZPORT is not set
+# CONFIG_USB_SERIAL_QUATECH2 is not set
+CONFIG_USB_SERIAL_ZTE=m
+CONFIG_VIDEO_VIVI=m
+# CONFIG_W35UND is not set
+
Modified: dists/trunk/linux/debian/config/kernelarch-mips/config.loongson-2f
==============================================================================
--- dists/trunk/linux/debian/config/kernelarch-mips/config.loongson-2f Tue Dec 9 20:43:11 2014 (r22167)
+++ dists/trunk/linux/debian/config/kernelarch-mips/config.loongson-2f Tue Dec 9 20:49:45 2014 (r22168)
@@ -76,11 +76,6 @@
# CONFIG_SCSI_LPFC is not set
##
-## file: drivers/staging/sm7xxfb/Kconfig
-##
-CONFIG_FB_SM7XX=y
-
-##
## file: drivers/tty/Kconfig
##
CONFIG_VT=y
@@ -137,3 +132,8 @@
##
CONFIG_SND_CS5535AUDIO=m
+##
+## file: unknown
+##
+CONFIG_FB_SM7XX=y
+
Modified: dists/trunk/linux/debian/config/kernelarch-mips/config.octeon
==============================================================================
--- dists/trunk/linux/debian/config/kernelarch-mips/config.octeon Tue Dec 9 20:43:11 2014 (r22167)
+++ dists/trunk/linux/debian/config/kernelarch-mips/config.octeon Tue Dec 9 20:49:45 2014 (r22168)
@@ -128,8 +128,8 @@
##
CONFIG_USB_EHCI_HCD=m
CONFIG_USB_OCTEON_EHCI=y
-CONFIG_USB_OCTEON_OHCI=y
CONFIG_USB_OHCI_HCD=m
+CONFIG_USB_OCTEON_OHCI=y
##
## file: kernel/power/Kconfig
Modified: dists/trunk/linux/debian/config/kernelarch-powerpc/config-arch-64
==============================================================================
--- dists/trunk/linux/debian/config/kernelarch-powerpc/config-arch-64 Tue Dec 9 20:43:11 2014 (r22167)
+++ dists/trunk/linux/debian/config/kernelarch-powerpc/config-arch-64 Tue Dec 9 20:49:45 2014 (r22168)
@@ -92,7 +92,6 @@
## file: drivers/scsi/Kconfig
##
CONFIG_SCSI_IBMVSCSI=m
-CONFIG_SCSI_IBMVSCSIS=m
CONFIG_SCSI_QLOGIC_1280=m
##
@@ -131,3 +130,8 @@
## end choice
CONFIG_SPARSEMEM_VMEMMAP=y
+##
+## file: unknown
+##
+CONFIG_SCSI_IBMVSCSIS=m
+
Modified: dists/trunk/linux/debian/config/kernelarch-x86/config
==============================================================================
--- dists/trunk/linux/debian/config/kernelarch-x86/config Tue Dec 9 20:43:11 2014 (r22167)
+++ dists/trunk/linux/debian/config/kernelarch-x86/config Tue Dec 9 20:49:45 2014 (r22168)
@@ -475,7 +475,6 @@
CONFIG_DRM_I915_KMS=y
CONFIG_DRM_I915_FBDEV=y
# CONFIG_DRM_I915_PRELIMINARY_HW_SUPPORT is not set
-# CONFIG_DRM_I915_UMS is not set
##
## file: drivers/gpu/drm/mgag200/Kconfig
@@ -721,6 +720,11 @@
CONFIG_LEDS_CLEVO_MAIL=m
##
+## file: drivers/media/dvb-frontends/Kconfig
+##
+CONFIG_DVB_RTL2832_SDR=m
+
+##
## file: drivers/media/platform/Kconfig
##
CONFIG_VIDEO_VIA_CAMERA=m
@@ -740,6 +744,21 @@
CONFIG_IR_WINBOND_CIR=m
##
+## file: drivers/media/tuners/Kconfig
+##
+CONFIG_MEDIA_TUNER_MSI001=m
+
+##
+## file: drivers/media/usb/as102/Kconfig
+##
+CONFIG_DVB_AS102=m
+
+##
+## file: drivers/media/usb/go7007/Kconfig
+##
+# CONFIG_VIDEO_GO7007 is not set
+
+##
## file: drivers/media/usb/tm6000/Kconfig
##
CONFIG_VIDEO_TM6000=m
@@ -1299,12 +1318,10 @@
CONFIG_COMEDI_DEFAULT_BUF_SIZE_KB=2048
CONFIG_COMEDI_DEFAULT_BUF_MAXSIZE_KB=20480
CONFIG_COMEDI_MISC_DRIVERS=y
-CONFIG_COMEDI_KCOMEDILIB=m
CONFIG_COMEDI_BOND=m
CONFIG_COMEDI_TEST=m
CONFIG_COMEDI_PARPORT=m
CONFIG_COMEDI_SERIAL2002=m
-# CONFIG_COMEDI_SKEL is not set
CONFIG_COMEDI_SSV_DNP=m
# CONFIG_COMEDI_ISA_DRIVERS is not set
CONFIG_COMEDI_UNIOXX5=m
@@ -1378,11 +1395,7 @@
CONFIG_COMEDI_USBDUXSIGMA=m
CONFIG_COMEDI_VMK80XX=m
CONFIG_COMEDI_8255=m
-
-##
-## file: drivers/staging/crystalhd/Kconfig
-##
-CONFIG_CRYSTALHD=m
+CONFIG_COMEDI_KCOMEDILIB=m
##
## file: drivers/staging/gdm72xx/Kconfig
@@ -1391,7 +1404,9 @@
# CONFIG_WIMAX_GDM72XX_QOS is not set
# CONFIG_WIMAX_GDM72XX_K_MODE is not set
# CONFIG_WIMAX_GDM72XX_WIMAX2 is not set
+## choice: Select interface
CONFIG_WIMAX_GDM72XX_USB=y
+## end choice
CONFIG_WIMAX_GDM72XX_USB_PM=y
##
@@ -1430,21 +1445,11 @@
CONFIG_STAGING_MEDIA=y
##
-## file: drivers/staging/media/as102/Kconfig
-##
-CONFIG_DVB_AS102=m
-
-##
## file: drivers/staging/media/bcm2048/Kconfig
##
# CONFIG_I2C_BCM2048 is not set
##
-## file: drivers/staging/media/go7007/Kconfig
-##
-# CONFIG_VIDEO_GO7007 is not set
-
-##
## file: drivers/staging/media/lirc/Kconfig
##
CONFIG_LIRC_STAGING=y
@@ -1458,32 +1463,11 @@
CONFIG_LIRC_ZILOG=m
##
-## file: drivers/staging/media/msi3101/Kconfig
-##
-CONFIG_USB_MSI3101=m
-CONFIG_MEDIA_TUNER_MSI001=m
-
-##
## file: drivers/staging/media/omap24xx/Kconfig
##
# CONFIG_VIDEO_TCM825X is not set
##
-## file: drivers/staging/media/rtl2832u_sdr/Kconfig
-##
-CONFIG_DVB_RTL2832_SDR=m
-
-##
-## file: drivers/staging/media/sn9c102/Kconfig
-##
-# CONFIG_USB_SN9C102 is not set
-
-##
-## file: drivers/staging/media/solo6x10/Kconfig
-##
-CONFIG_SOLO6X10=m
-
-##
## file: drivers/staging/rtl8192e/Kconfig
##
CONFIG_RTLLIB=m
@@ -1512,15 +1496,6 @@
## file: drivers/staging/rts5208/Kconfig
##
CONFIG_RTS5208=m
-# CONFIG_RTS5208_DEBUG is not set
-
-##
-## file: drivers/staging/usbip/Kconfig
-##
-CONFIG_USBIP_CORE=m
-CONFIG_USBIP_VHCI_HCD=m
-CONFIG_USBIP_HOST=m
-# CONFIG_USBIP_DEBUG is not set
##
## file: drivers/staging/vt6656/Kconfig
@@ -1594,6 +1569,10 @@
## file: drivers/usb/gadget/Kconfig
##
CONFIG_USB_GADGET=m
+
+##
+## file: drivers/usb/gadget/udc/Kconfig
+##
CONFIG_USB_EG20T=m
##
@@ -1608,6 +1587,14 @@
CONFIG_USB_SL811_CS=m
##
+## file: drivers/usb/usbip/Kconfig
+##
+CONFIG_USBIP_CORE=m
+CONFIG_USBIP_VHCI_HCD=m
+CONFIG_USBIP_HOST=m
+# CONFIG_USBIP_DEBUG is not set
+
+##
## file: drivers/vfio/Kconfig
##
CONFIG_VFIO=m
@@ -1696,8 +1683,8 @@
CONFIG_IE6XX_WDT=m
CONFIG_IT8712F_WDT=m
CONFIG_HP_WATCHDOG=m
-CONFIG_HPWDT_NMI_DECODING=y
CONFIG_KEMPLD_WDT=m
+CONFIG_HPWDT_NMI_DECODING=y
CONFIG_SC1200_WDT=m
CONFIG_NV_TCO=m
CONFIG_60XX_WDT=m
@@ -1898,3 +1885,14 @@
##
CONFIG_SND_HDA_INTEL=m
+##
+## file: unknown
+##
+# CONFIG_COMEDI_SKEL is not set
+CONFIG_CRYSTALHD=m
+# CONFIG_DRM_I915_UMS is not set
+# CONFIG_RTS5208_DEBUG is not set
+CONFIG_SOLO6X10=m
+CONFIG_USB_MSI3101=m
+# CONFIG_USB_SN9C102 is not set
+
Modified: dists/trunk/linux/debian/config/kernelarch-x86/config-arch-32
==============================================================================
--- dists/trunk/linux/debian/config/kernelarch-x86/config-arch-32 Tue Dec 9 20:43:11 2014 (r22167)
+++ dists/trunk/linux/debian/config/kernelarch-x86/config-arch-32 Tue Dec 9 20:49:45 2014 (r22168)
@@ -153,9 +153,6 @@
##
CONFIG_I2C_EG20T=m
CONFIG_I2C_PXA=m
-CONFIG_SCx200_I2C=m
-CONFIG_SCx200_I2C_SCL=12
-CONFIG_SCx200_I2C_SDA=13
##
## file: drivers/input/misc/Kconfig
@@ -469,7 +466,7 @@
CONFIG_SERIAL_8250_EXAR_ST16C554=m
##
-## file: drivers/usb/gadget/Kconfig
+## file: drivers/usb/gadget/udc/Kconfig
##
CONFIG_USB_AMD5536UDC=m
@@ -568,7 +565,14 @@
##
## file: sound/pci/Kconfig
##
-CONFIG_SND_SIS7019=m
CONFIG_SND_CS5530=m
CONFIG_SND_CS5535AUDIO=m
+CONFIG_SND_SIS7019=m
+
+##
+## file: unknown
+##
+CONFIG_SCx200_I2C=m
+CONFIG_SCx200_I2C_SCL=12
+CONFIG_SCx200_I2C_SDA=13
More information about the Kernel-svn-changes
mailing list