Merger DriverBinding and ComponentName into one <extern> section for all *.msa files

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

24 files changed, 8 insertions, 64 deletions

diff --git a/EdkModulePkg/Bus/Pci/AtapiPassThru/Dxe/AtapiPassThru.msa b/EdkModulePkg/Bus/Pci/AtapiPassThru/Dxe/AtapiPassThru.msa
index 38215799a5..47c9019541 100644
--- a/EdkModulePkg/Bus/Pci/AtapiPassThru/Dxe/AtapiPassThru.msa
+++ b/EdkModulePkg/Bus/Pci/AtapiPassThru/Dxe/AtapiPassThru.msa
@@ -15,8 +15,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
     <Version>1.0</Version>

     <Abstract>Description file for the Atapi Passthru component.</Abstract>

     <Description>

-      This driver simulates SCSI devices with Atapi devices to test the SCSI io  

-      protocol. 

+      This driver simulates SCSI devices with Atapi devices to test the SCSI io

+      protocol.

     </Description>

     <Copyright>Copyright (c) 2006, Intel Corporation</Copyright>

     <License>All rights reserved. This program and the accompanying materials

@@ -79,8 +79,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
     <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>

     <Extern>

       <DriverBinding>gAtapiScsiPassThruDriverBinding</DriverBinding>

-    </Extern>

-    <Extern>

       <ComponentName>gAtapiScsiPassThruComponentName</ComponentName>

     </Extern>

   </Externs>

diff --git a/EdkModulePkg/Bus/Pci/CirrusLogic/Dxe/CirrusLogic5430.msa b/EdkModulePkg/Bus/Pci/CirrusLogic/Dxe/CirrusLogic5430.msa
index e93539aca9..0dd3e4abcf 100644
--- a/EdkModulePkg/Bus/Pci/CirrusLogic/Dxe/CirrusLogic5430.msa
+++ b/EdkModulePkg/Bus/Pci/CirrusLogic/Dxe/CirrusLogic5430.msa
@@ -15,11 +15,11 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
     <Version>1.0</Version>

     <Abstract>Component description file for CirrusLogic5430 module</Abstract>

     <Description>

-      Cirrus Logic 5430 Controller Driver.This driver is a sample implementation 

-      of the UGA Draw Protocol for the Cirrus Logic 5430 family of PCI video controllers. 

-      This driver is only usable in the EFI pre-boot environment.  This sample is 

-      intended to show how the UGA Draw Protocol is able to function.  The UGA I/O 

-      Protocol is not implemented in this sample.  A fully compliant EFI UGA driver 

+      Cirrus Logic 5430 Controller Driver.This driver is a sample implementation

+      of the UGA Draw Protocol for the Cirrus Logic 5430 family of PCI video controllers.

+      This driver is only usable in the EFI pre-boot environment.  This sample is

+      intended to show how the UGA Draw Protocol is able to function.  The UGA I/O

+      Protocol is not implemented in this sample.  A fully compliant EFI UGA driver

       requires both the UGA Draw and the UGA I/O Protocol.  Please refer to Microsoft's

       documentation on UGA for details on how to write a UGA driver that is able

       to function both in the EFI pre-boot environment and from the OS runtime.

@@ -86,8 +86,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
     <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>

     <Extern>

       <DriverBinding>gCirrusLogic5430DriverBinding</DriverBinding>

-    </Extern>

-    <Extern>

       <ComponentName>gCirrusLogic5430ComponentName</ComponentName>

     </Extern>

   </Externs>

diff --git a/EdkModulePkg/Bus/Pci/Ehci/Dxe/Ehci.msa b/EdkModulePkg/Bus/Pci/Ehci/Dxe/Ehci.msa
index 3decbd86d0..8de9d5c549 100644
--- a/EdkModulePkg/Bus/Pci/Ehci/Dxe/Ehci.msa
+++ b/EdkModulePkg/Bus/Pci/Ehci/Dxe/Ehci.msa
@@ -79,8 +79,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
     <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>

     <Extern>

       <DriverBinding>gEhciDriverBinding</DriverBinding>

-    </Extern>

-    <Extern>

       <ComponentName>gEhciComponentName</ComponentName>

     </Extern>

   </Externs>

diff --git a/EdkModulePkg/Bus/Pci/IdeBus/Dxe/idebus.msa b/EdkModulePkg/Bus/Pci/IdeBus/Dxe/idebus.msa
index cea5076f3f..0805b5e4e5 100644
--- a/EdkModulePkg/Bus/Pci/IdeBus/Dxe/idebus.msa
+++ b/EdkModulePkg/Bus/Pci/IdeBus/Dxe/idebus.msa
@@ -120,8 +120,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
     <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>

     <Extern>

       <DriverBinding>gIDEBusDriverBinding</DriverBinding>

-    </Extern>

-    <Extern>

       <ComponentName>gIDEBusComponentName</ComponentName>

     </Extern>

   </Externs>

diff --git a/EdkModulePkg/Bus/Pci/PciBus/Dxe/PciBus.msa b/EdkModulePkg/Bus/Pci/PciBus/Dxe/PciBus.msa
index 6584fe5806..f6c017cd76 100644
--- a/EdkModulePkg/Bus/Pci/PciBus/Dxe/PciBus.msa
+++ b/EdkModulePkg/Bus/Pci/PciBus/Dxe/PciBus.msa
@@ -157,8 +157,6 @@
     </Extern>

     <Extern>

       <DriverBinding>gPciBusDriverBinding</DriverBinding>

-    </Extern>

-    <Extern>

       <ComponentName>gPciBusComponentName</ComponentName>

     </Extern>

   </Externs>

diff --git a/EdkModulePkg/Bus/Pci/Uhci/Dxe/Uhci.msa b/EdkModulePkg/Bus/Pci/Uhci/Dxe/Uhci.msa
index 3d24744f12..1c19ee50dc 100644
--- a/EdkModulePkg/Bus/Pci/Uhci/Dxe/Uhci.msa
+++ b/EdkModulePkg/Bus/Pci/Uhci/Dxe/Uhci.msa
@@ -80,8 +80,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
     <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>

     <Extern>

       <DriverBinding>gUhciDriverBinding</DriverBinding>

-    </Extern>

-    <Extern>

       <ComponentName>gUhciComponentName</ComponentName>

     </Extern>

   </Externs>

diff --git a/EdkModulePkg/Bus/Scsi/ScsiBus/Dxe/ScsiBus.msa b/EdkModulePkg/Bus/Scsi/ScsiBus/Dxe/ScsiBus.msa
index 3f1f37b6a6..ab2e50d2b8 100644
--- a/EdkModulePkg/Bus/Scsi/ScsiBus/Dxe/ScsiBus.msa
+++ b/EdkModulePkg/Bus/Scsi/ScsiBus/Dxe/ScsiBus.msa
@@ -15,7 +15,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
     <Version>1.0</Version>

     <Abstract>Component description file for Scsi Bus module.</Abstract>

     <Description>

-      SCSI bus driver. This driver scans all SCSI devices and export SCSI IO protocol    

+      SCSI bus driver. This driver scans all SCSI devices and export SCSI IO protocol

     </Description>

     <Copyright>Copyright (c) 2006, Intel Corporation</Copyright>

     <License>All rights reserved. This program and the accompanying materials

@@ -85,8 +85,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
     <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>

     <Extern>

       <DriverBinding>gSCSIBusDriverBinding</DriverBinding>

-    </Extern>

-    <Extern>

       <ComponentName>gScsiBusComponentName</ComponentName>

     </Extern>

   </Externs>

diff --git a/EdkModulePkg/Bus/Scsi/ScsiDisk/Dxe/ScsiDisk.msa b/EdkModulePkg/Bus/Scsi/ScsiDisk/Dxe/ScsiDisk.msa
index 3bcd9ecc3e..ade7c34cf4 100644
--- a/EdkModulePkg/Bus/Scsi/ScsiDisk/Dxe/ScsiDisk.msa
+++ b/EdkModulePkg/Bus/Scsi/ScsiDisk/Dxe/ScsiDisk.msa
@@ -82,8 +82,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
     <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>

     <Extern>

       <DriverBinding>gScsiDiskDriverBinding</DriverBinding>

-    </Extern>

-    <Extern>

       <ComponentName>gScsiDiskComponentName</ComponentName>

     </Extern>

   </Externs>

diff --git a/EdkModulePkg/Bus/Usb/UsbBot/Dxe/UsbBot.msa b/EdkModulePkg/Bus/Usb/UsbBot/Dxe/UsbBot.msa
index d6d4fd09f8..b16191f99b 100644
--- a/EdkModulePkg/Bus/Usb/UsbBot/Dxe/UsbBot.msa
+++ b/EdkModulePkg/Bus/Usb/UsbBot/Dxe/UsbBot.msa
@@ -86,8 +86,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
     <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>

     <Extern>

       <DriverBinding>gUsbBotDriverBinding</DriverBinding>

-    </Extern>

-    <Extern>

       <ComponentName>gUsbBotComponentName</ComponentName>

     </Extern>

   </Externs>

diff --git a/EdkModulePkg/Bus/Usb/UsbBus/Dxe/UsbBus.msa b/EdkModulePkg/Bus/Usb/UsbBus/Dxe/UsbBus.msa
index b0414e7e97..af7b76e0c2 100644
--- a/EdkModulePkg/Bus/Usb/UsbBus/Dxe/UsbBus.msa
+++ b/EdkModulePkg/Bus/Usb/UsbBus/Dxe/UsbBus.msa
@@ -98,8 +98,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
     <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>

     <Extern>

       <DriverBinding>gUsbBusDriverBinding</DriverBinding>

-    </Extern>

-    <Extern>

       <ComponentName>gUsbBusComponentName</ComponentName>

     </Extern>

   </Externs>

diff --git a/EdkModulePkg/Bus/Usb/UsbCbi/Dxe/Cbi0/UsbCbi0.msa b/EdkModulePkg/Bus/Usb/UsbCbi/Dxe/Cbi0/UsbCbi0.msa
index 702417e853..63a936b8e1 100644
--- a/EdkModulePkg/Bus/Usb/UsbCbi/Dxe/Cbi0/UsbCbi0.msa
+++ b/EdkModulePkg/Bus/Usb/UsbCbi/Dxe/Cbi0/UsbCbi0.msa
@@ -86,8 +86,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
     <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>

     <Extern>

       <DriverBinding>gUsbCbi0DriverBinding</DriverBinding>

-    </Extern>

-    <Extern>

       <ComponentName>gUsbCbi0ComponentName</ComponentName>

     </Extern>

   </Externs>

diff --git a/EdkModulePkg/Bus/Usb/UsbKb/Dxe/UsbKb.msa b/EdkModulePkg/Bus/Usb/UsbKb/Dxe/UsbKb.msa
index 8cf4228069..ba6a6d0648 100644
--- a/EdkModulePkg/Bus/Usb/UsbKb/Dxe/UsbKb.msa
+++ b/EdkModulePkg/Bus/Usb/UsbKb/Dxe/UsbKb.msa
@@ -96,8 +96,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
     <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>

     <Extern>

       <DriverBinding>gUsbKeyboardDriverBinding</DriverBinding>

-    </Extern>

-    <Extern>

       <ComponentName>gUsbKeyboardComponentName</ComponentName>

     </Extern>

   </Externs>

diff --git a/EdkModulePkg/Bus/Usb/UsbMassStorage/Dxe/UsbMassStorage.msa b/EdkModulePkg/Bus/Usb/UsbMassStorage/Dxe/UsbMassStorage.msa
index f4c3336011..f6613301c8 100644
--- a/EdkModulePkg/Bus/Usb/UsbMassStorage/Dxe/UsbMassStorage.msa
+++ b/EdkModulePkg/Bus/Usb/UsbMassStorage/Dxe/UsbMassStorage.msa
@@ -83,8 +83,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
     <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>

     <Extern>

       <DriverBinding>gUSBFloppyDriverBinding</DriverBinding>

-    </Extern>

-    <Extern>

       <ComponentName>gUsbMassStorageComponentName</ComponentName>

     </Extern>

   </Externs>

diff --git a/EdkModulePkg/Bus/Usb/UsbMouse/Dxe/UsbMouse.msa b/EdkModulePkg/Bus/Usb/UsbMouse/Dxe/UsbMouse.msa
index 40dc1e9e09..7b1e4401bf 100644
--- a/EdkModulePkg/Bus/Usb/UsbMouse/Dxe/UsbMouse.msa
+++ b/EdkModulePkg/Bus/Usb/UsbMouse/Dxe/UsbMouse.msa
@@ -88,8 +88,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
     <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>

     <Extern>

       <DriverBinding>gUsbMouseDriverBinding</DriverBinding>

-    </Extern>

-    <Extern>

       <ComponentName>gUsbMouseComponentName</ComponentName>

     </Extern>

   </Externs>

diff --git a/EdkModulePkg/Universal/ConPlatform/Dxe/ConPlatform.msa b/EdkModulePkg/Universal/ConPlatform/Dxe/ConPlatform.msa
index fe9ad28b6d..ac0da4fc63 100644
--- a/EdkModulePkg/Universal/ConPlatform/Dxe/ConPlatform.msa
+++ b/EdkModulePkg/Universal/ConPlatform/Dxe/ConPlatform.msa
@@ -130,14 +130,10 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
     <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>

     <Extern>

       <DriverBinding>gConPlatformTextInDriverBinding</DriverBinding>

-    </Extern>

-    <Extern>

       <ComponentName>gConPlatformComponentName</ComponentName>

     </Extern>

     <Extern>

       <DriverBinding>gConPlatformTextOutDriverBinding</DriverBinding>

-    </Extern>

-    <Extern>

       <ComponentName>gConPlatformComponentName</ComponentName>

     </Extern>

   </Externs>

diff --git a/EdkModulePkg/Universal/Console/ConSplitter/Dxe/ConSplitter.msa b/EdkModulePkg/Universal/Console/ConSplitter/Dxe/ConSplitter.msa
index 28fae0d0be..5ed3b4acf5 100644
--- a/EdkModulePkg/Universal/Console/ConSplitter/Dxe/ConSplitter.msa
+++ b/EdkModulePkg/Universal/Console/ConSplitter/Dxe/ConSplitter.msa
@@ -110,26 +110,18 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
     </Extern>

     <Extern>

       <DriverBinding>gConSplitterConInDriverBinding</DriverBinding>

-    </Extern>

-    <Extern>

       <ComponentName>gConSplitterConInComponentName</ComponentName>

     </Extern>

     <Extern>

       <DriverBinding>gConSplitterSimplePointerDriverBinding</DriverBinding>

-    </Extern>

-    <Extern>

       <ComponentName>gConSplitterSimplePointerComponentName</ComponentName>

     </Extern>

     <Extern>

       <DriverBinding>gConSplitterConOutDriverBinding</DriverBinding>

-    </Extern>

-    <Extern>

       <ComponentName>gConSplitterConOutComponentName</ComponentName>

     </Extern>

     <Extern>

       <DriverBinding>gConSplitterStdErrDriverBinding</DriverBinding>

-    </Extern>

-    <Extern>

       <ComponentName>gConSplitterStdErrComponentName</ComponentName>

     </Extern>

   </Externs>

diff --git a/EdkModulePkg/Universal/Console/GraphicsConsole/Dxe/GraphicsConsole.msa b/EdkModulePkg/Universal/Console/GraphicsConsole/Dxe/GraphicsConsole.msa
index fe9bc513f5..ed939220bc 100644
--- a/EdkModulePkg/Universal/Console/GraphicsConsole/Dxe/GraphicsConsole.msa
+++ b/EdkModulePkg/Universal/Console/GraphicsConsole/Dxe/GraphicsConsole.msa
@@ -87,8 +87,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
     <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>

     <Extern>

       <DriverBinding>gGraphicsConsoleDriverBinding</DriverBinding>

-    </Extern>

-    <Extern>

       <ComponentName>gGraphicsConsoleComponentName</ComponentName>

     </Extern>

   </Externs>

diff --git a/EdkModulePkg/Universal/Console/Terminal/Dxe/Terminal.msa b/EdkModulePkg/Universal/Console/Terminal/Dxe/Terminal.msa
index 58787efa7b..d1c8c352b6 100644
--- a/EdkModulePkg/Universal/Console/Terminal/Dxe/Terminal.msa
+++ b/EdkModulePkg/Universal/Console/Terminal/Dxe/Terminal.msa
@@ -127,8 +127,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
     <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>

     <Extern>

       <DriverBinding>gTerminalDriverBinding</DriverBinding>

-    </Extern>

-    <Extern>

       <ComponentName>gTerminalComponentName</ComponentName>

     </Extern>

   </Externs>

diff --git a/EdkModulePkg/Universal/Debugger/Debugport/Dxe/DebugPort.msa b/EdkModulePkg/Universal/Debugger/Debugport/Dxe/DebugPort.msa
index 66d4939fbc..5870cd5d1c 100644
--- a/EdkModulePkg/Universal/Debugger/Debugport/Dxe/DebugPort.msa
+++ b/EdkModulePkg/Universal/Debugger/Debugport/Dxe/DebugPort.msa
@@ -99,8 +99,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
     </Extern>

     <Extern>

       <DriverBinding>gDebugPortDriverBinding</DriverBinding>

-    </Extern>

-    <Extern>

       <ComponentName>gDebugPortComponentName</ComponentName>

     </Extern>

   </Externs>

diff --git a/EdkModulePkg/Universal/Disk/DiskIo/Dxe/DiskIo.msa b/EdkModulePkg/Universal/Disk/DiskIo/Dxe/DiskIo.msa
index 554caa3c99..34b5eb41bd 100644
--- a/EdkModulePkg/Universal/Disk/DiskIo/Dxe/DiskIo.msa
+++ b/EdkModulePkg/Universal/Disk/DiskIo/Dxe/DiskIo.msa
@@ -76,8 +76,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
     <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>

     <Extern>

       <DriverBinding>gDiskIoDriverBinding</DriverBinding>

-    </Extern>

-    <Extern>

       <ComponentName>gDiskIoComponentName</ComponentName>

     </Extern>

   </Externs>

diff --git a/EdkModulePkg/Universal/Disk/Partition/Dxe/Partition.msa b/EdkModulePkg/Universal/Disk/Partition/Dxe/Partition.msa
index 93ab188ecd..e6eab23d75 100644
--- a/EdkModulePkg/Universal/Disk/Partition/Dxe/Partition.msa
+++ b/EdkModulePkg/Universal/Disk/Partition/Dxe/Partition.msa
@@ -96,8 +96,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
     <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>

     <Extern>

       <DriverBinding>gPartitionDriverBinding</DriverBinding>

-    </Extern>

-    <Extern>

       <ComponentName>gPartitionComponentName</ComponentName>

     </Extern>

   </Externs>

diff --git a/EdkModulePkg/Universal/Network/PxeBc/Dxe/BC.msa b/EdkModulePkg/Universal/Network/PxeBc/Dxe/BC.msa
index d1b414fd3d..d7cc3671dd 100644
--- a/EdkModulePkg/Universal/Network/PxeBc/Dxe/BC.msa
+++ b/EdkModulePkg/Universal/Network/PxeBc/Dxe/BC.msa
@@ -123,8 +123,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
     </Extern>

     <Extern>

       <DriverBinding>gPxeBcDriverBinding</DriverBinding>

-    </Extern>

-    <Extern>

       <ComponentName>gPxeBcComponentName</ComponentName>

     </Extern>

   </Externs>

diff --git a/EdkModulePkg/Universal/Network/PxeDhcp4/Dxe/Dhcp4.msa b/EdkModulePkg/Universal/Network/PxeDhcp4/Dxe/Dhcp4.msa
index dbf817cc60..7c956351bd 100644
--- a/EdkModulePkg/Universal/Network/PxeDhcp4/Dxe/Dhcp4.msa
+++ b/EdkModulePkg/Universal/Network/PxeDhcp4/Dxe/Dhcp4.msa
@@ -86,8 +86,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
     <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>

     <Extern>

       <DriverBinding>gPxeDhcp4DriverBinding</DriverBinding>

-    </Extern>

-    <Extern>

       <ComponentName>gPxeDhcp4ComponentName</ComponentName>

     </Extern>

   </Externs>

diff --git a/EdkModulePkg/Universal/Network/Snp32_64/Dxe/SNP.msa b/EdkModulePkg/Universal/Network/Snp32_64/Dxe/SNP.msa
index b9efad3098..47300e9d11 100644
--- a/EdkModulePkg/Universal/Network/Snp32_64/Dxe/SNP.msa
+++ b/EdkModulePkg/Universal/Network/Snp32_64/Dxe/SNP.msa
@@ -101,8 +101,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
     <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>

     <Extern>

       <DriverBinding>mSimpleNetworkDriverBinding</DriverBinding>

-    </Extern>

-    <Extern>

       <ComponentName>gSimpleNetworkComponentName</ComponentName>

     </Extern>

   </Externs>