diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-23 13:34:47 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-23 13:34:47 -0400 |
| commit | 9d0715630ebf7bf70daa5e6d8db0e3061268c61e (patch) | |
| tree | 54562185002b22169d81e0fb3c21312cb510ac40 /arch/x86/Kconfig | |
| parent | c0c463d34adf0c150e5e24fa412fa23f3f7ddc27 (diff) | |
| parent | 06c3df49521c1b112b777cc4946e5de057c814ba (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: apb: Share APB timer code with other platforms
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 5f60ea190d5b..c3e03e46bc64 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig | |||
| @@ -623,6 +623,7 @@ config HPET_EMULATE_RTC | |||
| 623 | config APB_TIMER | 623 | config APB_TIMER |
| 624 | def_bool y if MRST | 624 | def_bool y if MRST |
| 625 | prompt "Langwell APB Timer Support" if X86_MRST | 625 | prompt "Langwell APB Timer Support" if X86_MRST |
| 626 | select DW_APB_TIMER | ||
| 626 | help | 627 | help |
| 627 | APB timer is the replacement for 8254, HPET on X86 MID platforms. | 628 | APB timer is the replacement for 8254, HPET on X86 MID platforms. |
| 628 | The APBT provides a stable time base on SMP | 629 | The APBT provides a stable time base on SMP |