diff options
| -rw-r--r-- | Documentation/timers/hpet.txt | 4 | ||||
| -rw-r--r-- | arch/x86/Kconfig | 4 | ||||
| -rw-r--r-- | drivers/char/hpet.c | 2 |
3 files changed, 4 insertions, 6 deletions
diff --git a/Documentation/timers/hpet.txt b/Documentation/timers/hpet.txt index 767392ffd31e..a484d2c109d7 100644 --- a/Documentation/timers/hpet.txt +++ b/Documentation/timers/hpet.txt | |||
| @@ -1,9 +1,7 @@ | |||
| 1 | High Precision Event Timer Driver for Linux | 1 | High Precision Event Timer Driver for Linux |
| 2 | 2 | ||
| 3 | The High Precision Event Timer (HPET) hardware follows a specification | 3 | The High Precision Event Timer (HPET) hardware follows a specification |
| 4 | by Intel and Microsoft which can be found at | 4 | by Intel and Microsoft, revision 1. |
| 5 | |||
| 6 | http://www.intel.com/hardwaredesign/hpetspec_1.pdf | ||
| 7 | 5 | ||
| 8 | Each HPET has one fixed-rate counter (at 10+ MHz, hence "High Precision") | 6 | Each HPET has one fixed-rate counter (at 10+ MHz, hence "High Precision") |
| 9 | and up to 32 comparators. Normally three or more comparators are provided, | 7 | and up to 32 comparators. Normally three or more comparators are provided, |
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index ab2ed5328f0a..c46662f64c39 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig | |||
| @@ -778,8 +778,8 @@ config HPET_TIMER | |||
| 778 | HPET is the next generation timer replacing legacy 8254s. | 778 | HPET is the next generation timer replacing legacy 8254s. |
| 779 | The HPET provides a stable time base on SMP | 779 | The HPET provides a stable time base on SMP |
| 780 | systems, unlike the TSC, but it is more expensive to access, | 780 | systems, unlike the TSC, but it is more expensive to access, |
| 781 | as it is off-chip. You can find the HPET spec at | 781 | as it is off-chip. The interface used is documented |
| 782 | <http://www.intel.com/hardwaredesign/hpetspec_1.pdf>. | 782 | in the HPET spec, revision 1. |
| 783 | 783 | ||
| 784 | You can safely choose Y here. However, HPET will only be | 784 | You can safely choose Y here. However, HPET will only be |
| 785 | activated if the platform and the BIOS support this feature. | 785 | activated if the platform and the BIOS support this feature. |
diff --git a/drivers/char/hpet.c b/drivers/char/hpet.c index 240b6cf1d97c..be54e5331a45 100644 --- a/drivers/char/hpet.c +++ b/drivers/char/hpet.c | |||
| @@ -42,7 +42,7 @@ | |||
| 42 | /* | 42 | /* |
| 43 | * The High Precision Event Timer driver. | 43 | * The High Precision Event Timer driver. |
| 44 | * This driver is closely modelled after the rtc.c driver. | 44 | * This driver is closely modelled after the rtc.c driver. |
| 45 | * http://www.intel.com/hardwaredesign/hpetspec_1.pdf | 45 | * See HPET spec revision 1. |
| 46 | */ | 46 | */ |
| 47 | #define HPET_USER_FREQ (64) | 47 | #define HPET_USER_FREQ (64) |
| 48 | #define HPET_DRIFT (500) | 48 | #define HPET_DRIFT (500) |
