From 907b28e99054202b9520f79891d9051eb1f39128 Mon Sep 17 00:00:00 2001
From: Suresh Siddha <suresh.b.siddha@intel.com>
Date: Mon, 30 Mar 2009 14:05:50 -0800
Subject: [PATCH] --- yaml --- r: 141977 b: refs/heads/master c:
 786c221a37d3931189d9c9421f63dec92f4d698b h: refs/heads/master i:   141975:
 04acdb2ee2d088d599816c94f2d16f39afcf3e2f v: v3

---
 [refs]                      | 2 +-
 trunk/include/acpi/actbl1.h | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 4aa1f0575213..bb7e56b254f0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7237d3de78ff89ec2e18eae5fe962d063024fef5
+refs/heads/master: 786c221a37d3931189d9c9421f63dec92f4d698b
diff --git a/trunk/include/acpi/actbl1.h b/trunk/include/acpi/actbl1.h
index 18963b968114..59ade0752473 100644
--- a/trunk/include/acpi/actbl1.h
+++ b/trunk/include/acpi/actbl1.h
@@ -1016,9 +1016,9 @@ struct acpi_madt_interrupt_source {
 struct acpi_madt_local_x2apic {
 	struct acpi_subtable_header header;
 	u16 reserved;		/* Reserved - must be zero */
-	u32 local_apic_id;	/* Processor X2_APIC ID  */
+	u32 local_apic_id;	/* Processor x2APIC ID  */
 	u32 lapic_flags;
-	u32 uid;		/* Extended X2_APIC processor ID */
+	u32 uid;		/* ACPI processor UID */
 };
 
 /* 10: Local X2APIC NMI (07/2008) */
@@ -1026,7 +1026,7 @@ struct acpi_madt_local_x2apic {
 struct acpi_madt_local_x2apic_nmi {
 	struct acpi_subtable_header header;
 	u16 inti_flags;
-	u32 uid;		/* Processor X2_APIC ID */
+	u32 uid;		/* ACPI processor UID */
 	u8 lint;		/* LINTn to which NMI is connected */
 	u8 reserved[3];
 };