diff options
| author | Ryan Harkin <ryan.harkin@linaro.org> | 2013-04-18 17:13:39 +0100 |
|---|---|---|
| committer | Ryan Harkin <ryan.harkin@linaro.org> | 2013-04-18 17:13:39 +0100 |
| commit | 4cbfd417d24602d2d9c05cc5693a6e6087d1c96d (patch) | |
| tree | ab092ce095acd67f57473d03148d2bcd848768ea /MdePkg/Include | |
| parent | 17ffede3b6118ef6ef73c531e888b89a44295689 (diff) | |
| parent | d4cb39392edddd6857a8d54223d0ad3d80a88d4e (diff) | |
Merge branch 'linaro-tracking-2013.04' into linaro-releaselinaro-uefi-2013.04
Conflicts:
PandaBoardPkg/Include/PandaBoard.h
PandaBoardPkg/Library/PandaBoardLib/Clock.c
PandaBoardPkg/Library/PandaBoardLib/PadConfiguration.c
Signed-off-by: Ryan Harkin <ryan.harkin@linaro.org>
Diffstat (limited to 'MdePkg/Include')
| -rw-r--r-- | MdePkg/Include/Guid/Cper.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/MdePkg/Include/Guid/Cper.h b/MdePkg/Include/Guid/Cper.h index ca9a9284f3..a5d91ff031 100644 --- a/MdePkg/Include/Guid/Cper.h +++ b/MdePkg/Include/Guid/Cper.h @@ -11,7 +11,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
@par Revision Reference:
- GUIDs introduced from UEFI 2.1 Specification.
+ GUIDs introduced from UEFI 2.3.1 Specification.
**/
@@ -209,7 +209,6 @@ typedef struct { UINT8 SecValidMask;
UINT8 Resv1;
UINT32 SectionFlags;
- UINT8 Resv2[3];
EFI_GUID SectionType;
EFI_GUID FruId;
UINT32 Severity;
|