From ace287611f35b7525bc8e7468e9093ea32d2464e Mon Sep 17 00:00:00 2001
From: "Gao, Liming" <liming.gao@intel.com>
Date: Fri, 24 Jan 2014 09:33:11 +0000
Subject: [PATCH] Update Module BaseName to avoid the same name.

Signed-off-by: Gao, Liming <liming.gao@intel.com>
Reviewed-by: Dong, Guo <guo.dong@intel.com>
Reviewed-by: Fu, Siyuan <siyuan.fu@intel.com>

git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@15176 6f19259b-4bc3-4df7-8a09-765794883524
---
 MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfig.c        | 4 ++--
 MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf         | 4 ++--
 MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfig.c b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfig.c
index 702f4f43cf..a9c6df9db9 100644
--- a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfig.c
+++ b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfig.c
@@ -1,7 +1,7 @@
 /** @file
   Helper functions for configuring or getting the parameters relating to iSCSI.
 
-Copyright (c) 2004 - 2012, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2004 - 2014, Intel Corporation. All rights reserved.<BR>
 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
@@ -1171,7 +1171,7 @@ IScsiConfigFormInit (
   CallbackInfo->RegisteredHandle = HiiAddPackages (
                                      &gIp4IScsiConfigGuid,
                                      CallbackInfo->DriverHandle,
-                                     IScsiDxeStrings,
+                                     IScsi4DxeStrings,
                                      IScsiConfigDxeBin,
                                      NULL
                                      );
diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf
index 9ad161f2e9..436ac6ef9f 100644
--- a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf
+++ b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf
@@ -1,7 +1,7 @@
 ## @file
 #  Component description file for IScsi module.
 #
-# Copyright (c) 2004 - 2011, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2004 - 2014, Intel Corporation. All rights reserved.<BR>
 # 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
@@ -14,7 +14,7 @@
 
 [Defines]
   INF_VERSION                    = 0x00010005
-  BASE_NAME                      = IScsiDxe
+  BASE_NAME                      = IScsi4Dxe
   FILE_GUID                      = 4579B72D-7EC4-4dd4-8486-083C86B182A7
   MODULE_TYPE                    = UEFI_DRIVER
   VERSION_STRING                 = 1.0
diff --git a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf b/MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf
index 423555aecc..3849b83227 100644
--- a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf
+++ b/MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf
@@ -1,7 +1,7 @@
 ## @file
 # Component name for module UefiPxeBc
 #
-# Copyright (c) 2007 - 2013, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2007 - 2014, Intel Corporation. All rights reserved.<BR>
 #
 #  This program and the accompanying materials
 #  are licensed and made available under the terms and conditions of the BSD License
@@ -17,7 +17,7 @@
 
 [Defines]
   INF_VERSION                    = 0x00010005
-  BASE_NAME                      = UefiPxeBcDxe
+  BASE_NAME                      = UefiPxe4BcDxe
   FILE_GUID                      = 3B1DEAB5-C75D-442e-9238-8E2FFB62B0BB
   MODULE_TYPE                    = UEFI_DRIVER
   VERSION_STRING                 = 1.0