diff options
| author | Justin M. Forbes <jforbes@redhat.com> | 2016-08-08 10:49:17 -0500 |
|---|---|---|
| committer | Justin M. Forbes <jforbes@redhat.com> | 2016-08-08 10:49:17 -0500 |
| commit | 02bb813ee69a461fc6952b6bb4a28942335165a9 (patch) | |
| tree | 23a0d08e94ddbc7b8e4626bde041476bd2516cc5 /config-generic | |
| parent | e9fda3244bf8a24d8413946529cc6134ca0bd802 (diff) | |
| download | kernel-02bb813ee69a461fc6952b6bb4a28942335165a9.tar.gz kernel-02bb813ee69a461fc6952b6bb4a28942335165a9.tar.xz kernel-02bb813ee69a461fc6952b6bb4a28942335165a9.zip | |
Linux v4.8-rc1
Diffstat (limited to 'config-generic')
| -rw-r--r-- | config-generic | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/config-generic b/config-generic index 4047344f0..0d34aaf5e 100644 --- a/config-generic +++ b/config-generic @@ -431,11 +431,13 @@ CONFIG_VIRTIO_INPUT=m CONFIG_VIRTIO_MMIO=m # CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES is not set CONFIG_VIRTIO_NET=m +CONFIG_VIRTIO_VSOCKETS=m CONFIG_HW_RANDOM_VIRTIO=m CONFIG_VIRTIO_CONSOLE=m CONFIG_VHOST_NET=m CONFIG_VHOST_SCSI=m # CONFIG_VHOST_CROSS_ENDIAN_LEGACY is not set +CONFIG_VHOST_VSOCK=m # # SCSI device support @@ -1857,13 +1859,13 @@ CONFIG_B43=m CONFIG_B43_SDIO=y CONFIG_B43_BCMA=y CONFIG_B43_BCMA_PIO=y -CONFIG_B43_DEBUG=y +# CONFIG_B43_DEBUG is not set CONFIG_B43_PHY_LP=y CONFIG_B43_PHY_N=y CONFIG_B43_PHY_HT=y CONFIG_B43_PHY_G=y CONFIG_B43LEGACY=m -CONFIG_B43LEGACY_DEBUG=y +# CONFIG_B43LEGACY_DEBUG is not set CONFIG_B43LEGACY_DMA=y CONFIG_B43LEGACY_PIO=y CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y @@ -2560,6 +2562,8 @@ CONFIG_TOUCHSCREEN_USB_COMPOSITE=m CONFIG_TOUCHSCREEN_W90X900=m # CONFIG_TOUCHSCREEN_BU21013 is not set CONFIG_TOUCHSCREEN_RM_TS=m +CONFIG_TOUCHSCREEN_SILEAD=m +CONFIG_TOUCHSCREEN_SIS_I2C=m CONFIG_TOUCHSCREEN_ST1232=m # CONFIG_TOUCHSCREEN_SURFACE3_SPI is not set CONFIG_TOUCHSCREEN_ATMEL_MXT=m @@ -3306,6 +3310,7 @@ CONFIG_RTC_DRV_M41T80=m CONFIG_RTC_DRV_M41T80_WDT=y CONFIG_RTC_DRV_M48T59=m CONFIG_RTC_DRV_MAX6900=m +CONFIG_RTC_DRV_MAX6916=m # CONFIG_RTC_DRV_M48T86 is not set CONFIG_RTC_DRV_PCF2127=m CONFIG_RTC_DRV_PCF8563=m @@ -5269,7 +5274,7 @@ CONFIG_PM_DEBUG=y # CONFIG_DPM_WATCHDOG is not set # revisit this in debug CONFIG_PM_TRACE=y CONFIG_PM_TRACE_RTC=y -CONFIG_PM_TEST_SUSPEND=y +# CONFIG_PM_TEST_SUSPEND is not set # CONFIG_PM_OPP is not set # CONFIG_PM_AUTOSLEEP is not set # CONFIG_PM_WAKELOCKS is not set |