Update DriverConfiguration2.h to avoid the name conflict with DriverConfiguration.h

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@2766 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/MdePkg/Include/Protocol/DriverConfiguration2.h b/MdePkg/Include/Protocol/DriverConfiguration2.h
index c086104d1858d632a7a1f15f6344626bef3240fd..9fb161570f4c9ce65821ff6f61825fc7ed5e02b0 100644 (file)
--- a/MdePkg/Include/Protocol/DriverConfiguration2.h
+++ b/MdePkg/Include/Protocol/DriverConfiguration2.h
@@ -14,8 +14,8 @@
 \r
 **/\r
 \r
 \r
 **/\r
 \r

-#ifndef __EFI_DRIVER_CONFIGURATION_H__\r
-#define __EFI_DRIVER_CONFIGURATION_H__\r
+#ifndef __EFI_DRIVER_CONFIGURATION2_H__\r
+#define __EFI_DRIVER_CONFIGURATION2_H__\r

 \r
 //\r
 // Global ID for the Driver Configuration Protocol defined in UEFI 2.0\r
 \r
 //\r
 // Global ID for the Driver Configuration Protocol defined in UEFI 2.0\r


@@ -150,8 +150,8 @@ EFI_STATUS
 **/\r
 typedef\r
 EFI_STATUS\r
 **/\r
 typedef\r
 EFI_STATUS\r

-(EFIAPI *EFI_DRIVER_CONFIGURATION_FORCE_DEFAULTS) (\r
-  IN EFI_DRIVER_CONFIGURATION_PROTOCOL                        *This,\r
+(EFIAPI *EFI_DRIVER_CONFIGURATION2_FORCE_DEFAULTS) (\r
+  IN EFI_DRIVER_CONFIGURATION2_PROTOCOL                        *This,\r

   IN  EFI_HANDLE                                              ControllerHandle,\r
   IN  EFI_HANDLE                                              ChildHandle  OPTIONAL,\r
   IN  UINT32                                                  DefaultType,\r
   IN  EFI_HANDLE                                              ControllerHandle,\r
   IN  EFI_HANDLE                                              ChildHandle  OPTIONAL,\r
   IN  UINT32                                                  DefaultType,\r


@@ -162,10 +162,10 @@ EFI_STATUS
 //\r
 //\r
 struct _EFI_DRIVER_CONFIGURATION2_PROTOCOL {\r
 //\r
 //\r
 struct _EFI_DRIVER_CONFIGURATION2_PROTOCOL {\r

-  EFI_DRIVER_CONFIGURATION2_SET_OPTIONS   SetOptions;\r
-  EFI_DRIVER_CONFIGURATION_OPTIONS_VALID  OptionsValid;\r
-  EFI_DRIVER_CONFIGURATION_FORCE_DEFAULTS ForceDefaults;\r
-  CHAR8                                   *SupportedLanguages;\r
+  EFI_DRIVER_CONFIGURATION2_SET_OPTIONS     SetOptions;\r
+  EFI_DRIVER_CONFIGURATION2_OPTIONS_VALID   OptionsValid;\r
+  EFI_DRIVER_CONFIGURATION2_FORCE_DEFAULTS  ForceDefaults;\r
+  CHAR8                                     *SupportedLanguages;\r

 };\r
 \r
 /**\r
 };\r
 \r
 /**\r