Commit-ID: ded1cc5cfc3b4bc007fe3bb8fbfd9e66d8d667d7 Gitweb: http://git.kernel.org/tip/ded1cc5cfc3b4bc007fe3bb8fbfd9e66d8d667d7 Author: Anna-Maria Gleixner <anna-maria@xxxxxxxxx> AuthorDate: Fri, 18 May 2012 16:45:54 +0000 Committer: Thomas Gleixner <tglx@xxxxxxxxxxxxx> CommitDate: Mon, 21 May 2012 11:01:44 +0200 sparc: Use: generic time config Signed-off-by: Anna-Maria Gleixner <anna-maria@xxxxxxxxx> Cc: David S. Miller <davem@xxxxxxxxxxxxx> Link: http://lkml.kernel.org/r/20120518163106.987564297@xxxxxxxxx Acked-by: Sam Ravnborg <sam@xxxxxxxxxxxx> Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx> --- arch/sparc/Kconfig | 15 +++------------ 1 files changed, 3 insertions(+), 12 deletions(-) diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig index 6c0683d..33399d3 100644 --- a/arch/sparc/Kconfig +++ b/arch/sparc/Kconfig @@ -30,11 +30,13 @@ config SPARC select USE_GENERIC_SMP_HELPERS if SMP select GENERIC_PCI_IOMAP select HAVE_NMI_WATCHDOG if SPARC64 + select GENERIC_CMOS_UPDATE config SPARC32 def_bool !64BIT select GENERIC_ATOMIC64 select CLZ_TAB + select ARCH_USES_GETTIMEOFFSET config SPARC64 def_bool 64BIT @@ -61,6 +63,7 @@ config SPARC64 select IRQ_PREFLOW_FASTEOI select ARCH_HAVE_NMI_SAFE_CMPXCHG select HAVE_C_RECORDMCOUNT + select GENERIC_CLOCKEVENTS config ARCH_DEFCONFIG string @@ -73,18 +76,6 @@ config BITS default 32 if SPARC32 default 64 if SPARC64 -config ARCH_USES_GETTIMEOFFSET - bool - default y if SPARC32 - -config GENERIC_CMOS_UPDATE - bool - default y - -config GENERIC_CLOCKEVENTS - bool - default y if SPARC64 - config IOMMU_HELPER bool default y if SPARC64 -- To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
|