diff options
author | Anna-Maria Gleixner <anna-maria@glx-um.de> | 2012-05-18 12:45:50 -0400 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2012-05-21 05:01:43 -0400 |
commit | cde1794b069f44ca02f3f4f50a903e9361132244 (patch) | |
tree | 35ffeb1277bccc1f3243f4957010e782b9cff375 /arch/mips/Kconfig | |
parent | d6412e2bdcd8dae1d502b49aff418275742d2887 (diff) |
mips: Use generic time config
Signed-off-by: Anna-Maria Gleixner <anna-maria@glx-um.de>
Cc: Ralf Baechle <ralf@linux-mips.org>
Link: http://lkml.kernel.org/r/20120518163106.073559820@glx-um.de
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/mips/Kconfig')
-rw-r--r-- | arch/mips/Kconfig | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig index ce30e2f91d77..c9c330bc4e76 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig | |||
@@ -29,6 +29,8 @@ config MIPS | |||
29 | select HAVE_MEMBLOCK | 29 | select HAVE_MEMBLOCK |
30 | select HAVE_MEMBLOCK_NODE_MAP | 30 | select HAVE_MEMBLOCK_NODE_MAP |
31 | select ARCH_DISCARD_MEMBLOCK | 31 | select ARCH_DISCARD_MEMBLOCK |
32 | select GENERIC_CLOCKEVENTS | ||
33 | select GENERIC_CMOS_UPDATE | ||
32 | 34 | ||
33 | menu "Machine selection" | 35 | menu "Machine selection" |
34 | 36 | ||
@@ -856,14 +858,6 @@ config GENERIC_CALIBRATE_DELAY | |||
856 | bool | 858 | bool |
857 | default y | 859 | default y |
858 | 860 | ||
859 | config GENERIC_CLOCKEVENTS | ||
860 | bool | ||
861 | default y | ||
862 | |||
863 | config GENERIC_CMOS_UPDATE | ||
864 | bool | ||
865 | default y | ||
866 | |||
867 | config SCHED_OMIT_FRAME_POINTER | 861 | config SCHED_OMIT_FRAME_POINTER |
868 | bool | 862 | bool |
869 | default y | 863 | default y |
@@ -2050,9 +2044,6 @@ config CPU_HAS_SYNC | |||
2050 | depends on !CPU_R3000 | 2044 | depends on !CPU_R3000 |
2051 | default y | 2045 | default y |
2052 | 2046 | ||
2053 | config GENERIC_CLOCKEVENTS_BROADCAST | ||
2054 | bool | ||
2055 | |||
2056 | # | 2047 | # |
2057 | # CPU non-features | 2048 | # CPU non-features |
2058 | # | 2049 | # |