Merge git://git.denx.de/u-boot-marvell
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 9b8d189..aaf87f4 100644
--- 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 44b9f12..6160217 100644
--- 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 a6296c2..895b807 100644
--- 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 */
}