Merger trackers #7807 and #8372.

[mirror_edk2.git] / Nt32Pkg / Include / Protocol / WinNtIo.h

diff --git a/Nt32Pkg/Include/Protocol/WinNtIo.h b/Nt32Pkg/Include/Protocol/WinNtIo.h
index f407e78856a3eae40dd0ed8e4e59792c3e6236ed..91d112bd54a3e7e427571bb409da4bf96903b15b 100644 (file)
--- a/Nt32Pkg/Include/Protocol/WinNtIo.h
+++ b/Nt32Pkg/Include/Protocol/WinNtIo.h
@@ -1,13 +1,13 @@
 /*++\r
 \r
-Copyright (c) 2006, Intel Corporation                                                         \r
-All rights reserved. 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
-                                                                                          \r
-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
+Copyright (c) 2006, Intel Corporation\r
+All rights reserved. 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
+\r
+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:\r
 \r
@@ -59,16 +59,6 @@ extern EFI_GUID gEfiWinNtVirtualDisksGuid;
 \r
 extern EFI_GUID gEfiWinNtPhysicalDisksGuid;\r
 \r
-//\r
-// EFI_WIN_NT_GOP_GUID\r
-//\r
-#define EFI_WIN_NT_GOP_GUID \\r
-  { \\r
-    0x4e11e955, 0xccca, 0x11d4, {0xbd, 0x0d, 0x00, 0x80, 0xc7, 0x3c, 0x88, 0x81} \\r
-  }\r
-\r
-extern EFI_GUID gEfiWinNtGopGuid;\r
-\r
 //\r
 // EFI_WIN_NT_FILE_SYSTEM\r
 //\r
@@ -99,6 +89,16 @@ extern EFI_GUID gEfiWinNtSerialPortGuid;
 \r
 extern EFI_GUID gEfiWinNtUgaGuid;\r
 \r
+//\r
+// EFI_WIN_NT_GOP\r
+//\r
+#define EFI_WIN_NT_GOP_GUID \\r
+  { \\r
+    0x4e11e955, 0xccca, 0x11d4, 0xbd, 0xd, 0x0, 0x80, 0xc7, 0x3c, 0x88, 0x81 \\r
+  }\r
+\r
+extern EFI_GUID gEfiWinNtGopGuid;\r
+\r
 //\r
 // EFI_WIN_NT_CONSOLE\r
 //\r