aboutsummaryrefslogtreecommitdiffstats
path: root/arch/c6x
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-05-24 16:29:46 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2012-05-24 16:29:46 -0400
commitc7523a7c88db637d66841018532cb4b3ab6ab0a8 (patch)
treecec08263a493831d43e17d4daa633e2a6b09480e /arch/c6x
parent2f78d8e249973f1eeb88315e6444e616c60177ae (diff)
parentb80fe1015be4e3c926d8eb4cc6a340fdd22a43e1 (diff)
Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull timer updates from Thomas Gleixner. Various trivial conflict fixups in arch Kconfig due to addition of unrelated entries nearby. And one slightly more subtle one for sparc32 (new user of GENERIC_CLOCKEVENTS), fixed up as per Thomas. * 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (31 commits) timekeeping: Fix a few minor newline issues. time: remove obsolete declaration ntp: Fix a stale comment and a few stray newlines. ntp: Correct TAI offset during leap second timers: Fixup the Kconfig consolidation fallout x86: Use generic time config unicore32: Use generic time config um: Use generic time config tile: Use generic time config sparc: Use: generic time config sh: Use generic time config score: Use generic time config s390: Use generic time config openrisc: Use generic time config powerpc: Use generic time config mn10300: Use generic time config mips: Use generic time config microblaze: Use generic time config m68k: Use generic time config m32r: Use generic time config ...
Diffstat (limited to 'arch/c6x')
-rw-r--r--arch/c6x/Kconfig8
1 files changed, 1 insertions, 7 deletions
diff --git a/arch/c6x/Kconfig b/arch/c6x/Kconfig
index 1f15b88b537f..052f81a76239 100644
--- a/arch/c6x/Kconfig
+++ b/arch/c6x/Kconfig
@@ -15,6 +15,7 @@ config C6X
15 select IRQ_DOMAIN 15 select IRQ_DOMAIN
16 select OF 16 select OF
17 select OF_EARLY_FLATTREE 17 select OF_EARLY_FLATTREE
18 select GENERIC_CLOCKEVENTS
18 19
19config MMU 20config MMU
20 def_bool n 21 def_bool n
@@ -31,12 +32,6 @@ config GENERIC_CALIBRATE_DELAY
31config GENERIC_HWEIGHT 32config GENERIC_HWEIGHT
32 def_bool y 33 def_bool y
33 34
34config GENERIC_CLOCKEVENTS
35 def_bool y
36
37config GENERIC_CLOCKEVENTS_BROADCAST
38 bool
39
40config GENERIC_BUG 35config GENERIC_BUG
41 def_bool y 36 def_bool y
42 37
@@ -125,7 +120,6 @@ source "mm/Kconfig"
125source "kernel/Kconfig.preempt" 120source "kernel/Kconfig.preempt"
126 121
127source "kernel/Kconfig.hz" 122source "kernel/Kconfig.hz"
128source "kernel/time/Kconfig"
129 123
130endmenu 124endmenu
131 125