diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2016-06-09 09:05:22 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2016-06-09 09:05:22 +0200 |
| commit | 20499dcef9eacf0025870ddf83edcf30f4b7f988 (patch) | |
| tree | 320f26d20ce29d4dc1a27846edfe9d3bd50b7f0f /config-arm64 | |
| parent | 9440a0e3048bb4b4de4ea180be75fa308eef706b (diff) | |
| parent | 6018c78135d15c8bfb8d3d7a1dc28c9dc4eee490 (diff) | |
| download | kernel-20499dcef9eacf0025870ddf83edcf30f4b7f988.tar.gz kernel-20499dcef9eacf0025870ddf83edcf30f4b7f988.tar.xz kernel-20499dcef9eacf0025870ddf83edcf30f4b7f988.zip | |
Merge remote-tracking branch 'origin/master'kernel-4.7.0-0.rc2.git2.1.vanilla.knurd.1.fc25kernel-4.7.0-0.rc2.git2.1.vanilla.knurd.1.fc24kernel-4.7.0-0.rc2.git2.1.vanilla.knurd.1.fc23kernel-4.7.0-0.rc2.git2.1.vanilla.knurd.1.fc22
Diffstat (limited to 'config-arm64')
| -rw-r--r-- | config-arm64 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/config-arm64 b/config-arm64 index de487b2e8..0d33b00ce 100644 --- a/config-arm64 +++ b/config-arm64 @@ -154,7 +154,8 @@ CONFIG_REGULATOR_HI655X=m CONFIG_PHY_HI6220_USB=m CONFIG_COMMON_RESET_HI6220=m CONFIG_HI6220_MBOX=m -# CONFIG_RESET_HISI is not set +CONFIG_RESET_HISI=y +CONFIG_MFD_HI655X_PMIC=m CONFIG_DRM_HISI_KIRIN=m CONFIG_HISI_KIRIN_DW_DSI=m @@ -175,7 +176,6 @@ CONFIG_NET_VENDOR_ALLWINNER=y # CONFIG_SERIO_SUN4I_PS2 is not set CONFIG_SUNXI_WATCHDOG=m CONFIG_MFD_SUN6I_PRCM=y -# CONFIG_MFD_HI655X_PMIC is not set CONFIG_IR_SUNXI=m CONFIG_MMC_SUNXI=m CONFIG_RTC_DRV_SUN6I=m |