diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2016-05-24 07:53:18 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2016-05-24 07:53:18 +0200 |
| commit | 3d1f9b96026f06f1d6130a975ad9988c33dc3b0d (patch) | |
| tree | 2a785b0cc414418e76274b39ad21a5a64fc5ae9f /config-arm64 | |
| parent | a7a0c90031acf1cd1e7bd777bda70e1738c805c9 (diff) | |
| parent | cfaea7dc727cbea3f1150d2f8e9749a167519e32 (diff) | |
| download | kernel-4.7.0-0.rc0.git6.1.vanilla.knurd.1.fc22.tar.gz kernel-4.7.0-0.rc0.git6.1.vanilla.knurd.1.fc22.tar.xz kernel-4.7.0-0.rc0.git6.1.vanilla.knurd.1.fc22.zip | |
Merge remote-tracking branch 'origin/master'kernel-4.7.0-0.rc0.git6.1.vanilla.knurd.1.fc24kernel-4.7.0-0.rc0.git6.1.vanilla.knurd.1.fc23kernel-4.7.0-0.rc0.git6.1.vanilla.knurd.1.fc22
Diffstat (limited to 'config-arm64')
| -rw-r--r-- | config-arm64 | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/config-arm64 b/config-arm64 index 7266b7db3..cc7214b89 100644 --- a/config-arm64 +++ b/config-arm64 @@ -158,6 +158,7 @@ CONFIG_REGULATOR_HI655X=m CONFIG_PHY_HI6220_USB=m CONFIG_COMMON_RESET_HI6220=m CONFIG_HI6220_MBOX=m +# CONFIG_RESET_HISI is not set # Tegra CONFIG_ARCH_TEGRA_132_SOC=y @@ -176,6 +177,7 @@ 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 @@ -227,3 +229,4 @@ CONFIG_DEBUG_SECTION_MISMATCH=y # Will probably need to be changed later # CONFIG_NUMA is not set + |