diff options
| author | Laura Abbott <labbott@fedoraproject.org> | 2016-05-23 11:41:00 -0700 |
|---|---|---|
| committer | Laura Abbott <labbott@fedoraproject.org> | 2016-05-23 11:41:00 -0700 |
| commit | cfaea7dc727cbea3f1150d2f8e9749a167519e32 (patch) | |
| tree | fdb18ecd726e4826d306ac6c424901690f425935 /config-generic | |
| parent | 8a052bf240d0b95d9c255ca9291a0669e5e28ac5 (diff) | |
| download | kernel-cfaea7dc727cbea3f1150d2f8e9749a167519e32.tar.gz kernel-cfaea7dc727cbea3f1150d2f8e9749a167519e32.tar.xz kernel-cfaea7dc727cbea3f1150d2f8e9749a167519e32.zip | |
Linux v4.6-8907-g7639dad
- trace, f2fs, btrfs, rtc, mailbox, akpm, staging, driver core, char, usb,
tty, clk, net, devicetree, rdma, mfd, iio, powerpc, arm merges
Diffstat (limited to 'config-generic')
| -rw-r--r-- | config-generic | 26 |
1 files changed, 25 insertions, 1 deletions
diff --git a/config-generic b/config-generic index 9601b58d2..b94ee30f7 100644 --- a/config-generic +++ b/config-generic @@ -215,7 +215,8 @@ CONFIG_BINFMT_MISC=m # CONFIG_COMMON_CLK_CS2000_CP is not set # CONFIG_COMMON_CLK_PWM is not set # CONFIG_COMMON_CLK_CDCE925 is not set -# +# CONFIG_COMMON_CLK_OXNAS is not set +# CONFIG_COMMON_CLK_HI3519 is not set # # Generic Driver Options @@ -238,6 +239,7 @@ CONFIG_REGMAP_I2C=m # CONFIG_CMA is not set # CONFIG_DMA_CMA is not set # CONFIG_FENCE_TRACE is not set +# CONFIG_SYNC_FILE is not set # CONFIG_SPI is not set # CONFIG_SPI_ALTERA is not set @@ -3012,6 +3014,8 @@ CONFIG_ACPI_ALS=m # CONFIG_AD5421 is not set # CONFIG_AD5449 is not set # CONFIG_AD5504 is not set +# CONFIG_AD5592R is not set +# CONFIG_AD5593R is not set # CONFIG_AD5624R_SPI is not set # CONFIG_AD5686 is not set # CONFIG_AD5755 is not set @@ -3074,6 +3078,18 @@ CONFIG_PA12203001=m # CONFIG_TSYS02D is not set # CONFIG_HI8435 is not set # CONFIG_IMX7D_ADC is not set +# CONFIG_AM2315 is not set +# CONFIG_BMI160_I2C is not set +# CONFIG_BMI160_SPI is not set +# CONFIG_BH1780 is not set +# CONFIG_MAX44000 is not set +# CONFIG_VEML6070 is not set +# CONFIG_BMC150_MAGN_I2C is not set +# CONFIG_BMC150_MAGN_SPI is not set +# CONFIG_DS1803 is not set +# CONFIG_MCP4131 is not set +# CONFIG_HP03 is not set +# CONFIG_HP206C is not set # staging IIO drivers # CONFIG_AD7291 is not set @@ -3304,6 +3320,7 @@ CONFIG_RTC_DRV_PCF85063=m # CONFIG_RTC_DRV_ABB5ZES3 is not set # CONFIG_RTC_DRV_ZYNQMP is not set # CONFIG_RTC_DRV_RV8803 is not set +# CONFIG_RTC_DRV_DS1302 is not set CONFIG_R3964=m # CONFIG_APPLICOM is not set @@ -4358,6 +4375,7 @@ CONFIG_USB_EZUSB_FX2=m CONFIG_USB_HSIC_USB3503=m # CONFIG_USB_LINK_LAYER_TEST is not set CONFIG_USB_CHAOSKEY=m +CONFIG_UCSI=m CONFIG_USB_LCD=m CONFIG_USB_LD=m CONFIG_USB_LEGOTOWER=m @@ -4494,6 +4512,8 @@ CONFIG_MFD_VIPERBOARD=m # CONFIG_MFD_MAX77686 is not set # CONFIG_MFD_MAX8907 is not set # CONFIG_MFD_TPS65086 is not set +# CONFIG_MFD_MAX77620 is not set +# CONFIG_MFD_MAX77693 is not set # # File systems @@ -5656,6 +5676,7 @@ CONFIG_ALTERA_STAPL=m CONFIG_USBIP_CORE=m CONFIG_USBIP_VHCI_HCD=m CONFIG_USBIP_HOST=m +CONFIG_USBIP_VUDC=m # CONFIG_USBIP_DEBUG is not set # CONFIG_INTEL_MEI is not set # CONFIG_VT6655 is not set @@ -5747,6 +5768,7 @@ CONFIG_CLEANCACHE=y CONFIG_FRONTSWAP=y CONFIG_ZSWAP=y CONFIG_ZBUD=y +CONFIG_Z3FOLD=y CONFIG_ZSMALLOC=y # CONFIG_ZSMALLOC_STAT is not set # CONFIG_PGTABLE_MAPPING is not set @@ -5961,3 +5983,5 @@ CONFIG_SYSTEM_BLACKLIST_KEYRING=y # CONFIG_MCE_AMD_INJ is not set # CONFIG_EZNPS_GIC is not set + +CONFIG_NMI_LOG_BUF_SHIFT=13 |