diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-12-12 13:12:51 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-12-12 13:12:51 +0100 |
| commit | a39240835e5afe2d5d94b27436dcda86cece94cb (patch) | |
| tree | 3490640ba61e1e994edc565e0659afa5356154cd | |
| parent | fa116ea35ec7f40e890972324409e99eed008d56 (diff) | |
| parent | e45f2c07742d447597df001c878bc4a8aafcde37 (diff) | |
Merge branch 'timers/hpet' into auto-timers-next
| -rw-r--r-- | arch/x86/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/char/hpet.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index ac22bb7719f7..19f0d97829ee 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -482,7 +482,7 @@ config HPET_TIMER The HPET provides a stable time base on SMP systems, unlike the TSC, but it is more expensive to access, as it is off-chip. You can find the HPET spec at - <http://www.intel.com/hardwaredesign/hpetspec.htm>. + <http://www.intel.com/hardwaredesign/hpetspec_1.pdf>. You can safely choose Y here. However, HPET will only be activated if the platform and the BIOS support this feature. diff --git a/drivers/char/hpet.c b/drivers/char/hpet.c index 53fdc7ff3870..32b8bbf5003e 100644 --- a/drivers/char/hpet.c +++ b/drivers/char/hpet.c @@ -46,7 +46,7 @@ /* * The High Precision Event Timer driver. * This driver is closely modelled after the rtc.c driver. - * http://www.intel.com/hardwaredesign/hpetspec.htm + * http://www.intel.com/hardwaredesign/hpetspec_1.pdf */ #define HPET_USER_FREQ (64) #define HPET_DRIFT (500) |