summaryrefslogtreecommitdiffstats
path: root/config-arm-generic
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@fedoraproject.org>2016-03-18 09:54:47 -0400
committerJosh Boyer <jwboyer@fedoraproject.org>2016-03-18 09:54:47 -0400
commit1e6dda8d922d6c7ea13769cfc7d80ea09d7464bb (patch)
tree16d1c0053ed21a9a32849e29702e6d5cc2b327af /config-arm-generic
parent47bb021b79b211ec738da2bd2b9c2d98f630483b (diff)
downloadkernel-1e6dda8d922d6c7ea13769cfc7d80ea09d7464bb.tar.gz
kernel-1e6dda8d922d6c7ea13769cfc7d80ea09d7464bb.tar.xz
kernel-1e6dda8d922d6c7ea13769cfc7d80ea09d7464bb.zip
Linux v4.5-3654-g5cd0911a9e0e
- Fix oops from tsc subsystem (rhbz 1318596) - crypto, security, docs, rproc, dmaengine, powersupply, hsi, vfio, driver-core, tty, char, usb, configfs, ext4, dlm, gfs2, pstore 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 8215a36a8..aa0ad4933 100644
--- a/config-arm-generic
+++ b/config-arm-generic
@@ -131,6 +131,8 @@ CONFIG_REGULATOR_ACT8865=m
CONFIG_ROCKCHIP_PM_DOMAINS=y
CONFIG_CRYPTO_DEV_ROCKCHIP=m
CONFIG_ROCKCHIP_EFUSE=m
+CONFIG_PHY_ROCKCHIP_EMMC=m
+CONFIG_PHY_ROCKCHIP_DP=m
# Tegra
CONFIG_ARM_TEGRA_CPUFREQ=y