1 files changed, 4 insertions, 16 deletions

diff --git a/arch/i386/kernel/acpi/boot.c b/arch/i386/kernel/acpi/boot.c
index 56818cf5bc40..fb3e72328a5a 100644
--- a/arch/i386/kernel/acpi/boot.c
+++ b/arch/i386/kernel/acpi/boot.c
@@ -616,6 +616,7 @@ static int __init acpi_parse_sbf(struct acpi_table_header *table)
 }
 
 #ifdef CONFIG_HPET_TIMER
+#include <asm/hpet.h>
 
 static int __init acpi_parse_hpet(struct acpi_table_header *table)
 {
@@ -646,24 +647,11 @@ static int __init acpi_parse_hpet(struct acpi_table_header *table)
                 hpet_res->end = (1 * 1024) - 1;
         }
 
-#ifdef CONFIG_X86_64
-        vxtime.hpet_address = hpet_tbl->address.address;
-
+        hpet_address = hpet_tbl->address.address;
         printk(KERN_INFO PREFIX "HPET id: %#x base: %#lx\n",
-                hpet_tbl->id, vxtime.hpet_address);
-
-        res_start = vxtime.hpet_address;
-#else                          /* X86 */
-        {
-                extern unsigned long hpet_address;
+               hpet_tbl->id, hpet_address);
 
-                hpet_address = hpet_tbl->address.address;
-                printk(KERN_INFO PREFIX "HPET id: %#x base: %#lx\n",
-                        hpet_tbl->id, hpet_address);
-
-                res_start = hpet_address;
-        }
-#endif                         /* X86 */
+        res_start = hpet_address;
 
         if (hpet_res) {
                 hpet_res->start = res_start;