Merger trackers #7807 and #8372.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@4153 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
vanjeff
2007-10-17 06:55:15 +00:00
parent 6e98e26326
commit 62409219a1
9 changed files with 124 additions and 113 deletions

View File

@@ -1,13 +1,13 @@
/*++
Copyright (c) 2006, Intel Corporation
All rights reserved. This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License
which accompanies this distribution. The full text of the license may be found at
http://opensource.org/licenses/bsd-license.php
THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
Copyright (c) 2006, Intel Corporation
All rights reserved. This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License
which accompanies this distribution. The full text of the license may be found at
http://opensource.org/licenses/bsd-license.php
THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
Module Name:
@@ -59,16 +59,6 @@ extern EFI_GUID gEfiWinNtVirtualDisksGuid;
extern EFI_GUID gEfiWinNtPhysicalDisksGuid;
//
// EFI_WIN_NT_GOP_GUID
//
#define EFI_WIN_NT_GOP_GUID \
{ \
0x4e11e955, 0xccca, 0x11d4, {0xbd, 0x0d, 0x00, 0x80, 0xc7, 0x3c, 0x88, 0x81} \
}
extern EFI_GUID gEfiWinNtGopGuid;
//
// EFI_WIN_NT_FILE_SYSTEM
//
@@ -99,6 +89,16 @@ extern EFI_GUID gEfiWinNtSerialPortGuid;
extern EFI_GUID gEfiWinNtUgaGuid;
//
// EFI_WIN_NT_GOP
//
#define EFI_WIN_NT_GOP_GUID \
{ \
0x4e11e955, 0xccca, 0x11d4, 0xbd, 0xd, 0x0, 0x80, 0xc7, 0x3c, 0x88, 0x81 \
}
extern EFI_GUID gEfiWinNtGopGuid;
//
// EFI_WIN_NT_CONSOLE
//