Home Home > GIT Browse > stable-xen
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff Mahoney <jeffm@suse.com>2017-08-16 08:11:49 -0400
committerJeff Mahoney <jeffm@suse.com>2017-08-16 08:11:49 -0400
commit75f0a86bc7b05991d224b53d81cb91dd025a35f5 (patch)
tree3c103e6fa50efa5c0664182e1ec8cd69e28084d7
parent4bb7465e14907a919becd9c94115a5fc39af6ea2 (diff)
parentb5bf58a5d5470c3d56baf0663a0ff17d75d8ae40 (diff)
Merge remote-tracking branch 'origin/users/afaerber/master/for-next'
-rw-r--r--config/arm64/default4
1 files changed, 2 insertions, 2 deletions
diff --git a/config/arm64/default b/config/arm64/default
index eeb7e76863..e25fcc0fd8 100644
--- a/config/arm64/default
+++ b/config/arm64/default
@@ -3932,7 +3932,7 @@ CONFIG_SPI_QUP=m
CONFIG_SPI_S3C64XX=m
CONFIG_SPI_SC18IS602=m
CONFIG_SPI_SUN4I=m
-# CONFIG_SPI_SUN6I is not set
+CONFIG_SPI_SUN6I=m
CONFIG_SPI_TEGRA20_SFLASH=m
CONFIG_SPI_THUNDERX=m
CONFIG_SPI_XCOMM=m
@@ -6821,7 +6821,7 @@ CONFIG_HAVE_S3C_RTC=y
CONFIG_RTC_DRV_S3C=m
CONFIG_RTC_DRV_PL030=y
CONFIG_RTC_DRV_PL031=y
-# CONFIG_RTC_DRV_SUN6I is not set
+CONFIG_RTC_DRV_SUN6I=y
CONFIG_RTC_DRV_MV=y
# CONFIG_RTC_DRV_ARMADA38X is not set
CONFIG_RTC_DRV_FTRTC010=m