diff options
| author | Anna-Maria Gleixner <anna-maria@glx-um.de> | 2012-05-18 12:45:46 -0400 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2012-05-21 05:01:42 -0400 |
| commit | 5227b636eca4226287e43fc1de1e09a694bcaa34 (patch) | |
| tree | 8e13ea680837b37423d2b7a2ea4312c8b1378d66 | |
| parent | 6220443db41899606a8621215e0f6e99477f7152 (diff) | |
cris: Use generic time config
Signed-off-by: Anna-Maria Gleixner <anna-maria@glx-um.de>
Cc: Jesper Nilsson <jesper.nilsson@axis.com>
Link: http://lkml.kernel.org/r/20120518163105.286556794@glx-um.de
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
| -rw-r--r-- | arch/cris/Kconfig | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/arch/cris/Kconfig b/arch/cris/Kconfig index b3abfb08aa5c..4a63e7eca105 100644 --- a/arch/cris/Kconfig +++ b/arch/cris/Kconfig | |||
| @@ -13,12 +13,6 @@ config RWSEM_GENERIC_SPINLOCK | |||
| 13 | config RWSEM_XCHGADD_ALGORITHM | 13 | config RWSEM_XCHGADD_ALGORITHM |
| 14 | bool | 14 | bool |
| 15 | 15 | ||
| 16 | config GENERIC_CMOS_UPDATE | ||
| 17 | def_bool y | ||
| 18 | |||
| 19 | config ARCH_USES_GETTIMEOFFSET | ||
| 20 | def_bool n | ||
| 21 | |||
| 22 | config ARCH_HAS_ILOG2_U32 | 16 | config ARCH_HAS_ILOG2_U32 |
| 23 | bool | 17 | bool |
| 24 | default n | 18 | default n |
| @@ -49,6 +43,7 @@ config CRIS | |||
| 49 | select HAVE_GENERIC_HARDIRQS | 43 | select HAVE_GENERIC_HARDIRQS |
| 50 | select GENERIC_IRQ_SHOW | 44 | select GENERIC_IRQ_SHOW |
| 51 | select GENERIC_IOMAP | 45 | select GENERIC_IOMAP |
| 46 | select GENERIC_CMOS_UPDATE | ||
| 52 | 47 | ||
| 53 | config HZ | 48 | config HZ |
| 54 | int | 49 | int |
