diff options
| author | Justin M. Forbes <jforbes@fedoraproject.org> | 2017-05-15 10:20:02 -0500 |
|---|---|---|
| committer | Justin M. Forbes <jforbes@fedoraproject.org> | 2017-05-15 10:20:02 -0500 |
| commit | ac4ad6bdf334a0200bb64532d377fb4fddd5614a (patch) | |
| tree | b270644a6486bfd8ca40679e9434c6d558455c07 /kernel-armv7hl.config | |
| parent | fd234dbc0e1170ff58cfac4cf7a1ba07ad53f8e0 (diff) | |
| download | kernel-ac4ad6bdf334a0200bb64532d377fb4fddd5614a.tar.gz kernel-ac4ad6bdf334a0200bb64532d377fb4fddd5614a.tar.xz kernel-ac4ad6bdf334a0200bb64532d377fb4fddd5614a.zip | |
Linux v4.12-rc1
Diffstat (limited to 'kernel-armv7hl.config')
| -rw-r--r-- | kernel-armv7hl.config | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config index 24049d7fc..1db8e0725 100644 --- a/kernel-armv7hl.config +++ b/kernel-armv7hl.config @@ -495,6 +495,7 @@ CONFIG_BATMAN_ADV_DAT=y CONFIG_BATMAN_ADV=m CONFIG_BATMAN_ADV_MCAST=y CONFIG_BATMAN_ADV_NC=y +CONFIG_BATTERY_AXP20X=m CONFIG_BATTERY_BQ27XXX_I2C=m CONFIG_BATTERY_BQ27XXX=m CONFIG_BATTERY_DA9052=m @@ -517,6 +518,7 @@ CONFIG_BAYCOM_SER_HDX=m # CONFIG_BCACHE_DEBUG is not set CONFIG_BCACHE=m CONFIG_BCM2835_MBOX=y +CONFIG_BCM2835_THERMAL=m # CONFIG_BCM2835_VCHIQ is not set CONFIG_BCM2835_WDT=m CONFIG_BCM63XX_PHY=m @@ -2669,6 +2671,8 @@ CONFIG_JOYSTICK_IFORCE_USB=y CONFIG_JOYSTICK_INTERACT=m CONFIG_JOYSTICK_JOYDUMP=m CONFIG_JOYSTICK_MAGELLAN=m +CONFIG_JOYSTICK_PSXPAD_SPI_FF=y +CONFIG_JOYSTICK_PSXPAD_SPI=m CONFIG_JOYSTICK_SIDEWINDER=m CONFIG_JOYSTICK_SPACEBALL=m CONFIG_JOYSTICK_SPACEORB=m @@ -5981,6 +5985,7 @@ CONFIG_TEST_KSTRTOX=y # CONFIG_TEST_UUID is not set # CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE is not set # CONFIG_THERMAL_DEFAULT_GOV_USER_SPACE is not set +CONFIG_THERMAL_EMERGENCY_POWEROFF_DELAY_MS=0 # CONFIG_THERMAL_EMULATION is not set # CONFIG_THERMAL_GOV_BANG_BANG is not set CONFIG_THERMAL_GOV_FAIR_SHARE=y @@ -6159,6 +6164,7 @@ CONFIG_UBIFS_FS_ADVANCED_COMPR=y CONFIG_UBIFS_FS_ENCRYPTION=y CONFIG_UBIFS_FS_LZO=y CONFIG_UBIFS_FS=m +CONFIG_UBIFS_FS_SECURITY=y CONFIG_UBIFS_FS_ZLIB=y # CONFIG_UBSAN_ALIGNMENT is not set # CONFIG_UBSAN is not set |