summaryrefslogtreecommitdiffstats
path: root/config-generic
diff options
context:
space:
mode:
authorLaura Abbott <labbott@fedoraproject.org>2015-11-11 09:29:29 -0800
committerLaura Abbott <labbott@fedoraproject.org>2015-11-11 09:30:47 -0800
commit4edc7cd99aa0d7c322edb6ec17a26c33a51fab8d (patch)
tree734bd42ba5a5b1fabff68361e235bbc94609747d /config-generic
parentc78c67f036a933ab5081ba89cde5b0601e2172cf (diff)
downloadkernel-4edc7cd99aa0d7c322edb6ec17a26c33a51fab8d.tar.gz
kernel-4edc7cd99aa0d7c322edb6ec17a26c33a51fab8d.tar.xz
kernel-4edc7cd99aa0d7c322edb6ec17a26c33a51fab8d.zip
Linux v4.3-11481-gc5a3788
- Actually drop CONFIG_DMADEVICES_VDEBUG
Diffstat (limited to 'config-generic')
-rw-r--r--config-generic7
1 files changed, 6 insertions, 1 deletions
diff --git a/config-generic b/config-generic
index 1dd664562..5ce621244 100644
--- a/config-generic
+++ b/config-generic
@@ -2606,7 +2606,7 @@ CONFIG_I2C_CHARDEV=m
# CONFIG_I2C_MUX_PCA9541 is not set
# CONFIG_I2C_MUX_PINCTRL is not set
# CONFIG_I2C_MUX_REG is not set
-#
+# CONFIG_I2C_CADENCE is not set
#
# I2C Algorithms
@@ -3103,6 +3103,7 @@ CONFIG_WM831X_WATCHDOG=m
# CONFIG_GPIO_WATCHDOG is not set
# CONFIG_XILINX_WATCHDOG is not set
# CONFIG_CADENCE_WATCHDOG is not set
+# CONFIG_BCM7038_WDT is not set
CONFIG_HW_RANDOM=y
CONFIG_HW_RANDOM_TIMERIOMEM=m
@@ -3189,6 +3190,7 @@ CONFIG_RTC_DRV_PCF85063=m
# CONFIG_RTC_DRV_XGENE is not set
# CONFIG_RTC_DRV_ABB5ZES3 is not set
# CONFIG_RTC_DRV_ZYNQMP is not set
+# CONFIG_RTC_DRV_RV8803 is not set
CONFIG_R3964=m
# CONFIG_APPLICOM is not set
@@ -3615,6 +3617,7 @@ CONFIG_FB_EFI=y
# CONFIG_FB_GOLDFISH is not set
# CONFIG_FB_OPENCORES is not set
# CONFIG_FB_SM712 is not set
+# CONFIG_FB_IBM_GXT4500 is not set
# CONFIG_FIRMWARE_EDID is not set
@@ -4593,6 +4596,7 @@ CONFIG_GFS2_FS_LOCKING_DLM=y
CONFIG_UBIFS_FS=m
# CONFIG_UBIFS_FS_ADVANCED_COMPR is not set
+CONFIG_UBIFS_ATIME_SUPPORT=y
#
# Partition Types
@@ -5244,6 +5248,7 @@ CONFIG_ASYNC_TX_DMA=y
# CONFIG_HSU_DMA is not set
# CONFIG_HSU_DMA_PCI is not set
# CONFIG_XGENE_DMA is not set
+# CONFIG_INTEL_IDMA64 is not set
CONFIG_UNUSED_SYMBOLS=y