---

yaml --- r: 307598 b: refs/heads/master c: 5227b63 h: refs/heads/master v: v3
git-mirror · May 21, 2012 · 2399e92 · 2399e92
1 parent 53f1cce
commit 2399e92
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 7 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6220443db41899606a8621215e0f6e99477f7152
+refs/heads/master: 5227b636eca4226287e43fc1de1e09a694bcaa34
diff --git a/trunk/arch/cris/Kconfig b/trunk/arch/cris/Kconfig
@@ -13,12 +13,6 @@ config RWSEM_GENERIC_SPINLOCK
 config RWSEM_XCHGADD_ALGORITHM
 	bool
 
-config GENERIC_CMOS_UPDATE
-	def_bool y
-
-config ARCH_USES_GETTIMEOFFSET
-	def_bool n
-
 config ARCH_HAS_ILOG2_U32
 	bool
 	default n
@@ -49,6 +43,7 @@ config CRIS
 	select HAVE_GENERIC_HARDIRQS
 	select GENERIC_IRQ_SHOW
 	select GENERIC_IOMAP
+	select GENERIC_CMOS_UPDATE
 
 config HZ
 	int