diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-08-14 23:10:00 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-08-14 23:10:00 -0400 |
| commit | 4c0e176dd5e4c44dd60f398518f75eedbe1a65f3 (patch) | |
| tree | 07aea7539f78f221c6fc535a94a07befa2afdb63 /arch/i386/Kconfig | |
| parent | f241be74b803dcf9d70c9978292946370654320f (diff) | |
| parent | 2ba84684e8cf6f980e4e95a2300f53a505eb794e (diff) | |
Merge /spare/repo/linux-2.6/
Diffstat (limited to 'arch/i386/Kconfig')
| -rw-r--r-- | arch/i386/Kconfig | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/i386/Kconfig b/arch/i386/Kconfig index a801d9d48606..619d843ba231 100644 --- a/arch/i386/Kconfig +++ b/arch/i386/Kconfig | |||
| @@ -454,8 +454,9 @@ config HPET_TIMER | |||
| 454 | Choose N to continue using the legacy 8254 timer. | 454 | Choose N to continue using the legacy 8254 timer. |
| 455 | 455 | ||
| 456 | config HPET_EMULATE_RTC | 456 | config HPET_EMULATE_RTC |
| 457 | bool "Provide RTC interrupt" | 457 | bool |
| 458 | depends on HPET_TIMER && RTC=y | 458 | depends on HPET_TIMER && RTC=y |
| 459 | default y | ||
| 459 | 460 | ||
| 460 | config SMP | 461 | config SMP |
| 461 | bool "Symmetric multi-processing support" | 462 | bool "Symmetric multi-processing support" |