diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2017-09-25 15:04:50 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2017-09-25 15:04:50 +0200 |
| commit | ffd057e177ebf334855140fb5b78baac5e530945 (patch) | |
| tree | fd8fb16fe8c9adf3357fc7d64675368ccec557d3 /kernel-aarch64-debug.config | |
| parent | 4a1c80bbc134fb793875c875f97fb144e09073bf (diff) | |
| parent | 8b5049f1b48b25d669bf33ec98e4fe8e381160f1 (diff) | |
| download | kernel-ffd057e177ebf334855140fb5b78baac5e530945.tar.gz kernel-ffd057e177ebf334855140fb5b78baac5e530945.tar.xz kernel-ffd057e177ebf334855140fb5b78baac5e530945.zip | |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-4.14.0-0.rc2.git0.1.vanilla.knurd.1.fc28kernel-4.14.0-0.rc2.git0.1.vanilla.knurd.1.fc27kernel-4.14.0-0.rc2.git0.1.vanilla.knurd.1.fc26kernel-4.14.0-0.rc2.git0.1.vanilla.knurd.1.fc25
Diffstat (limited to 'kernel-aarch64-debug.config')
| -rw-r--r-- | kernel-aarch64-debug.config | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config index 2dee2256b..db89fd2dd 100644 --- a/kernel-aarch64-debug.config +++ b/kernel-aarch64-debug.config @@ -559,7 +559,6 @@ CONFIG_BLK_DEV_SR=y CONFIG_BLK_DEV_SX8=m # CONFIG_BLK_DEV_THROTTLING_LOW is not set CONFIG_BLK_DEV_THROTTLING=y -# CONFIG_BLK_DEV_UB is not set CONFIG_BLK_DEV_UMEM=m CONFIG_BLK_DEV=y CONFIG_BLK_DEV_ZONED=y @@ -686,7 +685,6 @@ CONFIG_BT_RFCOMM_TTY=y CONFIG_BTRFS_FS=m CONFIG_BTRFS_FS_POSIX_ACL=y # CONFIG_BTRFS_FS_RUN_SANITY_TESTS is not set -CONFIG_BT_SCO=y # CONFIG_BT_SELFTEST is not set CONFIG_BTT=y CONFIG_BT_WILINK=m @@ -818,7 +816,7 @@ CONFIG_CHARGER_AXP20X=m # CONFIG_CHARGER_MANAGER is not set # CONFIG_CHARGER_MAX8903 is not set # CONFIG_CHARGER_PCF50633 is not set -# CONFIG_CHARGER_QCOM_SMBB is not set +CONFIG_CHARGER_QCOM_SMBB=m # CONFIG_CHARGER_RT9455 is not set # CONFIG_CHARGER_SBS is not set CONFIG_CHARGER_SMB347=m @@ -1246,7 +1244,7 @@ CONFIG_DNS_RESOLVER=m CONFIG_DONGLE=y CONFIG_DP83640_PHY=m CONFIG_DP83848_PHY=m -CONFIG_DP83867_PHY=m +# CONFIG_DP83867_PHY is not set # CONFIG_DPM_WATCHDOG is not set # revisit this in debug CONFIG_DPOT_DAC=m CONFIG_DRAGONRISE_FF=y @@ -1509,7 +1507,6 @@ CONFIG_ETHOC=m # CONFIG_EVM is not set # CONFIG_EXOFS_DEBUG is not set # CONFIG_EXOFS_FS is not set -CONFIG_EXPERIMENTAL=y # CONFIG_EXPERT is not set CONFIG_EXPORTFS=y # CONFIG_EXT2_FS is not set @@ -2209,7 +2206,6 @@ CONFIG_INFINIBAND_USNIC=m # CONFIG_INFTL is not set CONFIG_INITRAMFS_SOURCE="" CONFIG_INOTIFY_USER=y -CONFIG_INOTIFY=y # CONFIG_INPUT_AD714X is not set # CONFIG_INPUT_ADXL34X is not set CONFIG_INPUT_APANEL=m @@ -2283,6 +2279,7 @@ CONFIG_INTEL_XWAY_PHY=m # CONFIG_INV_MPU6050_I2C is not set # CONFIG_INV_MPU6050_IIO is not set # CONFIG_INV_MPU6050_SPI is not set +CONFIG_IOMMU_DMA=y # CONFIG_IOMMU_IO_PGTABLE_ARMV7S is not set # CONFIG_IOMMU_IO_PGTABLE_LPAE_SELFTEST is not set CONFIG_IOMMU_IO_PGTABLE_LPAE=y @@ -6017,7 +6014,6 @@ CONFIG_USB_KEENE=m CONFIG_USB_LAN78XX=m CONFIG_USB_LCD=m CONFIG_USB_LD=m -CONFIG_USB_LED=m CONFIG_USB_LEDS_TRIGGER_USBPORT=m CONFIG_USB_LED_TRIG=y CONFIG_USB_LEGOTOWER=m @@ -6319,6 +6315,7 @@ CONFIG_VIDEO_NOON010PC30=m CONFIG_VIDEO_PVRUSB2_DVB=y CONFIG_VIDEO_PVRUSB2=m CONFIG_VIDEO_PVRUSB2_SYSFS=y +CONFIG_VIDEO_QCOM_CAMSS=m CONFIG_VIDEO_QCOM_VENUS=m CONFIG_VIDEO_SAA6588=m CONFIG_VIDEO_SAA7134_ALSA=m |