Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

[sfrench/cifs-2.6.git] / Documentation / hpet.txt

diff --git a/Documentation/hpet.txt b/Documentation/hpet.txt
index e52457581f47ef0e6274f756a9f70ab8fcb61961..6ad52d9dad6cab36b4fac984aa3f39b3aba073fe 100644 (file)
--- a/Documentation/hpet.txt
+++ b/Documentation/hpet.txt
@@ -2,10 +2,10 @@
 
 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>.
+<http://www.intel.com/technology/architecture/hpetspec.htm>.
 
 The driver supports detection of HPET driver allocation and initialization
 of the HPET before the driver module_init routine is called.  This enables