diff options
| -rw-r--r-- | arch/x86/include/asm/hpet.h | 1 | ||||
| -rw-r--r-- | arch/x86/kernel/hpet.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/arch/x86/include/asm/hpet.h b/arch/x86/include/asm/hpet.h index b18df579c0e9..36f7125945e3 100644 --- a/arch/x86/include/asm/hpet.h +++ b/arch/x86/include/asm/hpet.h | |||
| @@ -63,6 +63,7 @@ | |||
| 63 | /* hpet memory map physical address */ | 63 | /* hpet memory map physical address */ |
| 64 | extern unsigned long hpet_address; | 64 | extern unsigned long hpet_address; |
| 65 | extern unsigned long force_hpet_address; | 65 | extern unsigned long force_hpet_address; |
| 66 | extern int boot_hpet_disable; | ||
| 66 | extern u8 hpet_blockid; | 67 | extern u8 hpet_blockid; |
| 67 | extern int hpet_force_user; | 68 | extern int hpet_force_user; |
| 68 | extern u8 hpet_msi_disable; | 69 | extern u8 hpet_msi_disable; |
diff --git a/arch/x86/kernel/hpet.c b/arch/x86/kernel/hpet.c index 8d80ae011603..4177bfbc80b0 100644 --- a/arch/x86/kernel/hpet.c +++ b/arch/x86/kernel/hpet.c | |||
| @@ -88,7 +88,7 @@ static inline void hpet_clear_mapping(void) | |||
| 88 | /* | 88 | /* |
| 89 | * HPET command line enable / disable | 89 | * HPET command line enable / disable |
| 90 | */ | 90 | */ |
| 91 | static int boot_hpet_disable; | 91 | int boot_hpet_disable; |
| 92 | int hpet_force_user; | 92 | int hpet_force_user; |
| 93 | static int hpet_verbose; | 93 | static int hpet_verbose; |
| 94 | 94 | ||
