Update IPsec.h file to follow approved ECR which will be collected into future UEFI...

[mirror_edk2.git] / MdePkg / Include / Guid / Acpi.h

diff --git a/MdePkg/Include/Guid/Acpi.h b/MdePkg/Include/Guid/Acpi.h
index a64f1b7ea0d11b2715e4b5b3a10b6fbdc2066a39..f7f94d946225a4a3376ae675444bfb562c7351c1 100644 (file)
--- a/MdePkg/Include/Guid/Acpi.h
+++ b/MdePkg/Include/Guid/Acpi.h
@@ -1,12 +1,12 @@
 /** @file\r
-  GUIDs used for ACPI entries in the EFI 1.0 system table\r
+  GUIDs used for ACPI entries in the EFI system table\r
 \r
   These GUIDs point the ACPI tables as defined in the ACPI specifications.\r
   ACPI 2.0 specification defines the ACPI 2.0 GUID. UEFI 2.0 defines the \r
   ACPI 2.0 Table GUID and ACPI Table GUID.\r
 \r
-  Copyright (c) 2006, Intel Corporation                                                         \r
-  All rights reserved. This program and the accompanying materials                          \r
+  Copyright (c) 2006 - 2009, Intel Corporation. All rights reserved.<BR>\r
+  This program and the accompanying materials                          \r
   are licensed and made available under the terms and conditions of the BSD License         \r
   which accompanies this distribution.  The full text of the license may be found at        \r
   http://opensource.org/licenses/bsd-license.php                                            \r
@@ -14,8 +14,6 @@
   THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
   WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             \r
 \r
-  Module Name:  Acpi.h\r
-\r
   @par Revision Reference:\r
   GUIDs defined in UEFI 2.0 spec.\r
 \r
@@ -24,7 +22,7 @@
 #ifndef __ACPI_GUID_H__\r
 #define __ACPI_GUID_H__\r
 \r
-#define EFI_ACPI_10_TABLE_GUID \\r
+#define ACPI_TABLE_GUID \\r
   { \\r
     0xeb9d2d30, 0x2d88, 0x11d3, {0x9a, 0x16, 0x0, 0x90, 0x27, 0x3f, 0xc1, 0x4d } \\r
   }\r
@@ -34,15 +32,15 @@
     0x8868e871, 0xe4f1, 0x11d3, {0xbc, 0x22, 0x0, 0x80, 0xc7, 0x3c, 0x88, 0x81 } \\r
   }\r
 \r
-#define ACPI_10_TABLE_GUID     EFI_ACPI_10_TABLE_GUID\r
+#define ACPI_10_TABLE_GUID     ACPI_TABLE_GUID\r
+\r
 //\r
 // ACPI 2.0 or newer tables should use EFI_ACPI_TABLE_GUID.\r
 //\r
 #define EFI_ACPI_20_TABLE_GUID EFI_ACPI_TABLE_GUID\r
-#define EFI_ACPI_30_TABLE_GUID EFI_ACPI_TABLE_GUID\r
 \r
+extern EFI_GUID gEfiAcpiTableGuid;\r
 extern EFI_GUID gEfiAcpi10TableGuid;\r
 extern EFI_GUID gEfiAcpi20TableGuid;\r
-extern EFI_GUID gEfiAcpi30TableGuid;\r
 \r
 #endif\r