summaryrefslogtreecommitdiffstats
path: root/config-arm64
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@fedoraproject.org>2014-10-21 09:22:39 -0400
committerJosh Boyer <jwboyer@fedoraproject.org>2014-10-21 09:22:39 -0400
commit27d39a95f697200a2f2d38dac457bd6720d2cd61 (patch)
treef75c2c0fc6c8b0a214be823a520849fdb2722a1f /config-arm64
parent5917cde9c1fa840708337929886e92865fcb1371 (diff)
downloadkernel-27d39a95f697200a2f2d38dac457bd6720d2cd61.tar.gz
kernel-27d39a95f697200a2f2d38dac457bd6720d2cd61.tar.xz
kernel-27d39a95f697200a2f2d38dac457bd6720d2cd61.zip
Linux v3.18-rc1-68-gc2661b806092
- Make LOG_BUF_SHIFT on arm64 the same as the rest of the arches (rhbz 1123327) - Enable RTC PL031 driver on arm64 (rhbz 1123882) - Reenable debugging options.
Diffstat (limited to 'config-arm64')
-rw-r--r--config-arm643
1 files changed, 1 insertions, 2 deletions
diff --git a/config-arm64 b/config-arm64
index 29a2436ac..eac2b9acb 100644
--- a/config-arm64
+++ b/config-arm64
@@ -42,7 +42,6 @@ CONFIG_HZ=100
CONFIG_KVM=y
CONFIG_KVM_ARM_MAX_VCPUS=8
-CONFIG_LOG_BUF_SHIFT=14
CONFIG_NFS_ACL_SUPPORT=y
CONFIG_NFS_COMMON=y
@@ -53,7 +52,7 @@ CONFIG_NFS_USE_KERNEL_DNS=y
# CONFIG_PL330_DMA is not set
CONFIG_RCU_FANOUT=64
# CONFIG_RTC_DRV_PL030 is not set
-# CONFIG_RTC_DRV_PL031 is not set
+CONFIG_RTC_DRV_PL031=y
CONFIG_SERIAL_8250_DMA=y
# CONFIG_SERIAL_AMBA_PL010 is not set
CONFIG_SPARSE_IRQ=y