diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-16 01:43:29 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-16 01:43:29 +0100 |
| commit | 3f02d072d46bb409e8ca3cf16c0511f5c21adaf6 (patch) | |
| tree | baec074db38a5ceaaabbcee76f199acef43bb42a /Documentation/hpet.txt | |
| parent | Merge master.kernel.org:/home/rmk/linux-2.6-arm (diff) | |
| parent | MAINTAINERS: CIFS: add linux-cifs-client@lists.samba.org list (diff) | |
| download | linux-3f02d072d46bb409e8ca3cf16c0511f5c21adaf6.tar.xz linux-3f02d072d46bb409e8ca3cf16c0511f5c21adaf6.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
Diffstat (limited to 'Documentation/hpet.txt')
| -rw-r--r-- | Documentation/hpet.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/hpet.txt b/Documentation/hpet.txt index e52457581f47..b7a3dc38dd52 100644 --- a/Documentation/hpet.txt +++ b/Documentation/hpet.txt @@ -2,7 +2,7 @@ The High Precision Event Timer (HPET) hardware is the future replacement for the 8254 and Real Time Clock (RTC) periodic timer functionality. -Each HPET can have up two 32 timers. It is possible to configure the +Each HPET can have up to 32 timers. It is possible to configure the first two timers as legacy replacements for 8254 and RTC periodic timers. A specification done by Intel and Microsoft can be found at <http://www.intel.com/hardwaredesign/hpetspec.htm>. |