summaryrefslogtreecommitdiffstats
path: root/config-arm-generic
diff options
context:
space:
mode:
authorLaura Abbott <labbott@fedoraproject.org>2016-05-19 09:48:08 -0700
committerLaura Abbott <labbott@fedoraproject.org>2016-05-19 09:50:01 -0700
commit39bfc7e6a160dcc72813b7996b41682b5e680393 (patch)
treedb678aa9d6d59ec124f6977de4322d561ddaf61c /config-arm-generic
parentaf495309bb553b4659f08470ac94fedf74b3845a (diff)
downloadkernel-39bfc7e6a160dcc72813b7996b41682b5e680393.tar.gz
kernel-39bfc7e6a160dcc72813b7996b41682b5e680393.tar.xz
kernel-39bfc7e6a160dcc72813b7996b41682b5e680393.zip
Linux v4.6-5028-g2600a46
trace, audit, input, media, scsi, armsoc merges
Diffstat (limited to 'config-arm-generic')
-rw-r--r--config-arm-generic2
1 files changed, 2 insertions, 0 deletions
diff --git a/config-arm-generic b/config-arm-generic
index 4bb634ff6..dfbab76cc 100644
--- a/config-arm-generic
+++ b/config-arm-generic
@@ -165,6 +165,7 @@ CONFIG_SND_HDA_TEGRA=m
# CONFIG_ARM_TEGRA20_CPUFREQ is not set
# CONFIG_MFD_NVEC is not set
+# CONFIG_PHY_TEGRA_XUSB is not set
# Virt
CONFIG_PARAVIRT=y
@@ -362,6 +363,7 @@ CONFIG_MTD_OF_PARTS=m
# CONFIG_MTD_CFI_ADV_OPTIONS is not set
CONFIG_MTD_PHYSMAP=m
CONFIG_MTD_PHYSMAP_OF=m
+CONFIG_MTD_PHYSMAP_OF_VERSATILE=y
# CONFIG_MTD_PHYSMAP_COMPAT is not set
# CONFIG_MTD_LPDDR2_NVM is not set