summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--baseconfig/arm/arm64/CONFIG_RTC_DRV_SUN6I2
-rw-r--r--baseconfig/arm/armv7/CONFIG_RTC_DRV_SUN6I2
-rw-r--r--kernel-aarch64-debug.config2
-rw-r--r--kernel-aarch64.config2
-rw-r--r--kernel-armv7hl-debug.config2
-rw-r--r--kernel-armv7hl-lpae-debug.config2
-rw-r--r--kernel-armv7hl-lpae.config2
-rw-r--r--kernel-armv7hl.config2
-rw-r--r--kernel.spec1
9 files changed, 9 insertions, 8 deletions
diff --git a/baseconfig/arm/arm64/CONFIG_RTC_DRV_SUN6I b/baseconfig/arm/arm64/CONFIG_RTC_DRV_SUN6I
index 7c9597c70..54410db09 100644
--- a/baseconfig/arm/arm64/CONFIG_RTC_DRV_SUN6I
+++ b/baseconfig/arm/arm64/CONFIG_RTC_DRV_SUN6I
@@ -1 +1 @@
-# CONFIG_RTC_DRV_SUN6I is not set
+CONFIG_RTC_DRV_SUN6I=y
diff --git a/baseconfig/arm/armv7/CONFIG_RTC_DRV_SUN6I b/baseconfig/arm/armv7/CONFIG_RTC_DRV_SUN6I
index 7c9597c70..54410db09 100644
--- a/baseconfig/arm/armv7/CONFIG_RTC_DRV_SUN6I
+++ b/baseconfig/arm/armv7/CONFIG_RTC_DRV_SUN6I
@@ -1 +1 @@
-# CONFIG_RTC_DRV_SUN6I is not set
+CONFIG_RTC_DRV_SUN6I=y
diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config
index e2b91c159..b0c8f40a6 100644
--- a/kernel-aarch64-debug.config
+++ b/kernel-aarch64-debug.config
@@ -4368,7 +4368,7 @@ CONFIG_RTC_DRV_S35390A=m
# CONFIG_RTC_DRV_SA1100 is not set
# CONFIG_RTC_DRV_SNVS is not set
CONFIG_RTC_DRV_STK17TA8=m
-# CONFIG_RTC_DRV_SUN6I is not set
+CONFIG_RTC_DRV_SUN6I=y
CONFIG_RTC_DRV_TEGRA=m
# CONFIG_RTC_DRV_TEST is not set
CONFIG_RTC_DRV_V3020=m
diff --git a/kernel-aarch64.config b/kernel-aarch64.config
index 4cedf372e..37bd5d69c 100644
--- a/kernel-aarch64.config
+++ b/kernel-aarch64.config
@@ -4346,7 +4346,7 @@ CONFIG_RTC_DRV_S35390A=m
# CONFIG_RTC_DRV_SA1100 is not set
# CONFIG_RTC_DRV_SNVS is not set
CONFIG_RTC_DRV_STK17TA8=m
-# CONFIG_RTC_DRV_SUN6I is not set
+CONFIG_RTC_DRV_SUN6I=y
CONFIG_RTC_DRV_TEGRA=m
# CONFIG_RTC_DRV_TEST is not set
CONFIG_RTC_DRV_V3020=m
diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config
index 718c4837a..0b75171a7 100644
--- a/kernel-armv7hl-debug.config
+++ b/kernel-armv7hl-debug.config
@@ -4742,7 +4742,7 @@ CONFIG_RTC_DRV_S5M=m
CONFIG_RTC_DRV_SNVS=m
CONFIG_RTC_DRV_STK17TA8=m
CONFIG_RTC_DRV_ST_LPC=m
-# CONFIG_RTC_DRV_SUN6I is not set
+CONFIG_RTC_DRV_SUN6I=y
CONFIG_RTC_DRV_SUNXI=m
CONFIG_RTC_DRV_TEGRA=m
# CONFIG_RTC_DRV_TEST is not set
diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config
index 98a039144..7bc14358d 100644
--- a/kernel-armv7hl-lpae-debug.config
+++ b/kernel-armv7hl-lpae-debug.config
@@ -4462,7 +4462,7 @@ CONFIG_RTC_DRV_S5M=m
# CONFIG_RTC_DRV_SA1100 is not set
# CONFIG_RTC_DRV_SNVS is not set
CONFIG_RTC_DRV_STK17TA8=m
-# CONFIG_RTC_DRV_SUN6I is not set
+CONFIG_RTC_DRV_SUN6I=y
CONFIG_RTC_DRV_SUNXI=m
CONFIG_RTC_DRV_TEGRA=m
# CONFIG_RTC_DRV_TEST is not set
diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config
index 5a8cf9c48..e5d1605ba 100644
--- a/kernel-armv7hl-lpae.config
+++ b/kernel-armv7hl-lpae.config
@@ -4440,7 +4440,7 @@ CONFIG_RTC_DRV_S5M=m
# CONFIG_RTC_DRV_SA1100 is not set
# CONFIG_RTC_DRV_SNVS is not set
CONFIG_RTC_DRV_STK17TA8=m
-# CONFIG_RTC_DRV_SUN6I is not set
+CONFIG_RTC_DRV_SUN6I=y
CONFIG_RTC_DRV_SUNXI=m
CONFIG_RTC_DRV_TEGRA=m
# CONFIG_RTC_DRV_TEST is not set
diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config
index 4d3b2fcff..66bd982ac 100644
--- a/kernel-armv7hl.config
+++ b/kernel-armv7hl.config
@@ -4720,7 +4720,7 @@ CONFIG_RTC_DRV_S5M=m
CONFIG_RTC_DRV_SNVS=m
CONFIG_RTC_DRV_STK17TA8=m
CONFIG_RTC_DRV_ST_LPC=m
-# CONFIG_RTC_DRV_SUN6I is not set
+CONFIG_RTC_DRV_SUN6I=y
CONFIG_RTC_DRV_SUNXI=m
CONFIG_RTC_DRV_TEGRA=m
# CONFIG_RTC_DRV_TEST is not set
diff --git a/kernel.spec b/kernel.spec
index c0069fbe3..51babfc80 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -2186,6 +2186,7 @@ fi
* Wed Apr 26 2017 Peter Robinson <pbrobinson@fedoraproject.org>
- Enable sound SoC on aarch64
- Update some ARM patches to latest upstream
+- ARM config updates
* Tue Apr 25 2017 Laura Abbott <labbott@fedoraproject.org> - 4.11.0-0.rc8.git1.1
- Linux v4.11-rc8-14-g8f9cedc