diff options
| author | Bernhard Walle <bwalle@suse.de> | 2008-02-06 04:38:52 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-06 13:41:14 -0500 |
| commit | 9d8af78b07976d4d84e0df491abd4e9db848d0ad (patch) | |
| tree | c90b4bd57147a9607ed2e860888110aef497ded8 /arch/x86 | |
| parent | 095b9d546f8fdac335989bd3d60405ff3af40ee9 (diff) | |
rtc: add HPET RTC emulation to RTC_DRV_CMOS
That patch adds the RTC emulation of the HPET timer to the new RTC_DRV_CMOS.
The old drivers/char/rtc.ko driver had that functionality and it's important
on new systems.
[akpm@linux-foundation.org: unbreak alpha build]
Signed-off-by: Bernhard Walle <bwalle@suse.de>
Cc: Alessandro Zummo <a.zummo@towertech.it>
Cc: David Brownell <david-b@pacbell.net>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Andi Kleen <ak@suse.de>
Cc: john stultz <johnstul@us.ibm.com>
Cc: Robert Picco <Robert.Picco@hp.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/x86')
| -rw-r--r-- | arch/x86/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 434821187cfc..e6728bd61cc1 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig | |||
| @@ -415,7 +415,7 @@ config HPET_TIMER | |||
| 415 | 415 | ||
| 416 | config HPET_EMULATE_RTC | 416 | config HPET_EMULATE_RTC |
| 417 | def_bool y | 417 | def_bool y |
| 418 | depends on HPET_TIMER && (RTC=y || RTC=m) | 418 | depends on HPET_TIMER && (RTC=y || RTC=m || RTC_DRV_CMOS=m || RTC_DRV_CMOS=y) |
| 419 | 419 | ||
| 420 | # Mark as embedded because too many people got it wrong. | 420 | # Mark as embedded because too many people got it wrong. |
| 421 | # The code disables itself when not needed. | 421 | # The code disables itself when not needed. |