Merge git://git.denx.de/u-boot-x86

diff --git a/arch/x86/include/asm/arch-baytrail/acpi/global_nvs.asl b/arch/x86/include/asm/arch-baytrail/acpi/global_nvs.asl
index 9b8d1895eeed6eb3def36e984eaba7b752bc1c58..aaf87f4735ddfdbca5d281418e8429e6ea21965b 100644 (file)
--- a/arch/x86/include/asm/arch-baytrail/acpi/global_nvs.asl
+++ b/arch/x86/include/asm/arch-baytrail/acpi/global_nvs.asl
@@ -8,7 +8,6 @@
 OperationRegion(GNVS, SystemMemory, ACPI_GNVS_ADDR, ACPI_GNVS_SIZE)
 Field(GNVS, ByteAcc, NoLock, Preserve)
 {
-       Offset (0x00),
        PCNT, 8,        /* processor count */
        IURE, 8,        /* internal UART enabled */
 }

diff --git a/arch/x86/include/asm/arch-quark/acpi/global_nvs.asl b/arch/x86/include/asm/arch-quark/acpi/global_nvs.asl
index 44b9f12c7c7b2abbdb9a05a400613a3c9a980519..61602173f8e65c013351e763711715c0d1500dd4 100644 (file)
--- a/arch/x86/include/asm/arch-quark/acpi/global_nvs.asl
+++ b/arch/x86/include/asm/arch-quark/acpi/global_nvs.asl
@@ -8,6 +8,5 @@
 OperationRegion(GNVS, SystemMemory, ACPI_GNVS_ADDR, ACPI_GNVS_SIZE)
 Field(GNVS, ByteAcc, NoLock, Preserve)
 {
-       Offset (0x00),
        PCNT, 8,        /* processor count */
 }

diff --git a/arch/x86/include/asm/arch-tangier/acpi/global_nvs.asl b/arch/x86/include/asm/arch-tangier/acpi/global_nvs.asl
index a6296c2cb60e1266d67b5028f1bc4de7317135ac..895b807e96eaaf7c0d01d5d0e1233c90d1dd35cc 100644 (file)
--- a/arch/x86/include/asm/arch-tangier/acpi/global_nvs.asl
+++ b/arch/x86/include/asm/arch-tangier/acpi/global_nvs.asl
@@ -10,6 +10,5 @@
 OperationRegion(GNVS, SystemMemory, ACPI_GNVS_ADDR, ACPI_GNVS_SIZE)
 Field(GNVS, ByteAcc, NoLock, Preserve)
 {
-    Offset (0x00),
     PCNT, 8,    /* processor count */
 }