From 60cf5698d1eedb0b1e92550dc220564ab3dab56f Mon Sep 17 00:00:00 2001 From: Anna-Maria Gleixner Date: Fri, 18 May 2012 16:45:54 +0000 Subject: [PATCH] --- yaml --- r: 307611 b: refs/heads/master c: ded1cc5cfc3b4bc007fe3bb8fbfd9e66d8d667d7 h: refs/heads/master i: 307609: bfe94c23c79cf607d75f62b1c7dab8adddf8458c 307607: bdf4591019285b67c09d92657c33ff40ec979e17 v: v3 --- [refs] | 2 +- trunk/arch/sparc/Kconfig | 15 +++------------ 2 files changed, 4 insertions(+), 13 deletions(-) diff --git a/[refs] b/[refs] index 6454089539ee..6c7de7170cf4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8cf200d8d01e71e8708a883a9cd0439cda6c2432 +refs/heads/master: ded1cc5cfc3b4bc007fe3bb8fbfd9e66d8d667d7 diff --git a/trunk/arch/sparc/Kconfig b/trunk/arch/sparc/Kconfig index 6c0683d3fcba..33399d3d90bc 100644 --- a/trunk/arch/sparc/Kconfig +++ b/trunk/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