diff --git a/[refs] b/[refs] index cfd9e9e08b44..7ff3f045c11c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5227b636eca4226287e43fc1de1e09a694bcaa34 +refs/heads/master: 24a6f35e192ed54205024742eb8a4a2f99c1da9d diff --git a/trunk/arch/hexagon/Kconfig b/trunk/arch/hexagon/Kconfig index 9059e3905887..7727ed9d2bf3 100644 --- a/trunk/arch/hexagon/Kconfig +++ b/trunk/arch/hexagon/Kconfig @@ -28,6 +28,9 @@ config HEXAGON select NO_IOPORT select GENERIC_IOMAP # mostly generic routines, with some accelerated ones + select KTIME_SCALAR + select GENERIC_CLOCKEVENTS + select GENERIC_CLOCKEVENTS_BROADCAST ---help--- Qualcomm Hexagon is a processor architecture designed for high performance and low power across a wide variety of applications. @@ -56,9 +59,6 @@ config PCI config EARLY_PRINTK def_bool y -config KTIME_SCALAR - def_bool y - config MMU def_bool y @@ -98,15 +98,6 @@ config GENERIC_FIND_NEXT_BIT config GENERIC_HWEIGHT def_bool y -config GENERIC_TIME - def_bool y - -config GENERIC_CLOCKEVENTS - def_bool y - -config GENERIC_CLOCKEVENTS_BROADCAST - def_bool y - config STACKTRACE_SUPPORT def_bool y select STACKTRACE