From: yshang1 <yshang1@6f19259b-4bc3-4df7-8a09-765794883524>
Date: Wed, 27 Jun 2007 03:43:06 +0000 (+0000)
Subject: Update DriverConfiguration2.h to avoid the name conflict with DriverConfiguration.h
X-Git-Tag: edk2-stable201903~23189
X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=commitdiff_plain;h=e30e5a72f91cc82f83800e3fde0b16ae9ad2243e

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 c086104d18..9fb161570f 100644
--- a/MdePkg/Include/Protocol/DriverConfiguration2.h
+++ b/MdePkg/Include/Protocol/DriverConfiguration2.h
@@ -14,8 +14,8 @@
 
 **/
 
-#ifndef __EFI_DRIVER_CONFIGURATION_H__
-#define __EFI_DRIVER_CONFIGURATION_H__
+#ifndef __EFI_DRIVER_CONFIGURATION2_H__
+#define __EFI_DRIVER_CONFIGURATION2_H__
 
 //
 // Global ID for the Driver Configuration Protocol defined in UEFI 2.0
@@ -150,8 +150,8 @@ EFI_STATUS
 **/
 typedef
 EFI_STATUS
-(EFIAPI *EFI_DRIVER_CONFIGURATION_FORCE_DEFAULTS) (
-  IN EFI_DRIVER_CONFIGURATION_PROTOCOL                        *This,
+(EFIAPI *EFI_DRIVER_CONFIGURATION2_FORCE_DEFAULTS) (
+  IN EFI_DRIVER_CONFIGURATION2_PROTOCOL                        *This,
   IN  EFI_HANDLE                                              ControllerHandle,
   IN  EFI_HANDLE                                              ChildHandle  OPTIONAL,
   IN  UINT32                                                  DefaultType,
@@ -162,10 +162,10 @@ EFI_STATUS
 //
 //
 struct _EFI_DRIVER_CONFIGURATION2_PROTOCOL {
-  EFI_DRIVER_CONFIGURATION2_SET_OPTIONS   SetOptions;
-  EFI_DRIVER_CONFIGURATION_OPTIONS_VALID  OptionsValid;
-  EFI_DRIVER_CONFIGURATION_FORCE_DEFAULTS ForceDefaults;
-  CHAR8                                   *SupportedLanguages;
+  EFI_DRIVER_CONFIGURATION2_SET_OPTIONS     SetOptions;
+  EFI_DRIVER_CONFIGURATION2_OPTIONS_VALID   OptionsValid;
+  EFI_DRIVER_CONFIGURATION2_FORCE_DEFAULTS  ForceDefaults;
+  CHAR8                                     *SupportedLanguages;
 };
 
 /**