]> git.openfabrics.org - ~shefty/rdma-dev.git/blobdiff - arch/x86/kernel/acpi/boot.c
Merge branch 'timers-for-linus-hpet' of git://git.kernel.org/pub/scm/linux/kernel...
[~shefty/rdma-dev.git] / arch / x86 / kernel / acpi / boot.c
index 67e929b89875bea8c06c5b8c454a43332862eb46..87eee07da21fc6fdcd3e4f6248f148064f3c5d89 100644 (file)
@@ -624,6 +624,7 @@ static int __init acpi_parse_hpet(struct acpi_table_header *table)
        }
 
        hpet_address = hpet_tbl->address.address;
+       hpet_blockid = hpet_tbl->sequence;
 
        /*
         * Some broken BIOSes advertise HPET at 0x0. We really do not