Linux Kernel Markers: document format string

[mv-sheeva.git] / include / asm-x86 / hpet.h

diff --git a/include/asm-x86/hpet.h b/include/asm-x86/hpet.h
index 47de4b8cdda93f96d0c343f1836d5194fe0edec5..b1f3c1ea55d959687f278b0107b63a96e9c69e8e 100644 (file)
--- a/include/asm-x86/hpet.h
+++ b/include/asm-x86/hpet.h
@@ -3,12 +3,6 @@
 
 #ifdef CONFIG_HPET_TIMER
 
-/*
- * Documentation on HPET can be found at:
- *      http://www.intel.com/ial/home/sp/pcmmspec.htm
- *      ftp://download.intel.com/ial/home/sp/mmts098.pdf
- */
-
 #define HPET_MMAP_SIZE         1024
 
 #define HPET_ID                        0x000
@@ -64,10 +58,11 @@
 /* hpet memory map physical address */
 extern unsigned long hpet_address;
 extern unsigned long force_hpet_address;
+extern int hpet_force_user;
 extern int is_hpet_enabled(void);
 extern int hpet_enable(void);
 extern unsigned long hpet_readl(unsigned long a);
-extern void ich_force_hpet_resume(void);
+extern void force_hpet_resume(void);
 
 #ifdef CONFIG_HPET_EMULATE_RTC