diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-19 20:44:13 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-19 20:44:13 -0400 |
| commit | 0f1bdc1815c4cb29b3cd71a7091b478e426faa0b (patch) | |
| tree | b4d70c6a305d91bf7d1c8a6bbf87508587d55633 /arch/x86/Kconfig | |
| parent | 80fe02b5daf176f99d3afc8f6c9dc9dece019836 (diff) | |
| parent | a18f22a968de17b29f2310cdb7ba69163e65ec15 (diff) | |
Merge branch 'timers-clocksource-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'timers-clocksource-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
clocksource: convert mips to generic i8253 clocksource
clocksource: convert x86 to generic i8253 clocksource
clocksource: convert footbridge to generic i8253 clocksource
clocksource: add common i8253 PIT clocksource
blackfin: convert to clocksource_register_hz
mips: convert to clocksource_register_hz/khz
sparc: convert to clocksource_register_hz/khz
alpha: convert to clocksource_register_hz
microblaze: convert to clocksource_register_hz/khz
ia64: convert to clocksource_register_hz/khz
x86: Convert remaining x86 clocksources to clocksource_register_hz/khz
Make clocksource name const
Diffstat (limited to 'arch/x86/Kconfig')
| -rw-r--r-- | arch/x86/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 650bb8c47eca..7a0ff52c73fa 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig | |||
| @@ -8,6 +8,7 @@ config 64BIT | |||
| 8 | 8 | ||
| 9 | config X86_32 | 9 | config X86_32 |
| 10 | def_bool !64BIT | 10 | def_bool !64BIT |
| 11 | select CLKSRC_I8253 | ||
| 11 | 12 | ||
| 12 | config X86_64 | 13 | config X86_64 |
| 13 | def_bool 64BIT | 14 | def_bool 64BIT |