From f6499efb935c884c81c8ae42dd4c68e6bde8e8f6 Mon Sep 17 00:00:00 2001 From: Matthias Maennich Date: Mon, 4 Feb 2019 17:33:19 +0000 Subject: [PATCH] ANDROID: cuttlefish_defconfig: Enable CONFIG_RTC_HCTOSYS This configuration is required for the VTS test VtsKernelApiSysfsTest#testRtcHctosys to pass. Bug: 123860857 Test: run vts-kernel -m VtsKernelApiSysfsTest Signed-off-by: Matthias Maennich Change-Id: Icae17c74460bcd2aef4cf4e3ec5381de9ea0a66c --- arch/arm64/configs/cuttlefish_defconfig | 1 - arch/x86/configs/x86_64_cuttlefish_defconfig | 1 - 2 files changed, 2 deletions(-) diff --git a/arch/arm64/configs/cuttlefish_defconfig b/arch/arm64/configs/cuttlefish_defconfig index 2c2212f42571..b7ba3f6a451b 100644 --- a/arch/arm64/configs/cuttlefish_defconfig +++ b/arch/arm64/configs/cuttlefish_defconfig @@ -369,7 +369,6 @@ CONFIG_MMC=y # CONFIG_PWRSEQ_SIMPLE is not set # CONFIG_MMC_BLOCK is not set CONFIG_RTC_CLASS=y -# CONFIG_RTC_HCTOSYS is not set # CONFIG_RTC_SYSTOHC is not set CONFIG_RTC_DRV_PL031=y CONFIG_VIRTIO_PCI=y diff --git a/arch/x86/configs/x86_64_cuttlefish_defconfig b/arch/x86/configs/x86_64_cuttlefish_defconfig index a84110ca9aa2..e8bc98bbb0db 100644 --- a/arch/x86/configs/x86_64_cuttlefish_defconfig +++ b/arch/x86/configs/x86_64_cuttlefish_defconfig @@ -382,7 +382,6 @@ CONFIG_MMC=y # CONFIG_PWRSEQ_SIMPLE is not set # CONFIG_MMC_BLOCK is not set CONFIG_RTC_CLASS=y -# CONFIG_RTC_HCTOSYS is not set CONFIG_SW_SYNC=y CONFIG_VIRTIO_PCI=y CONFIG_VIRTIO_BALLOON=y