Removed EFI_SIZE_REDUCTION_APPLIED and SIZE_REDUCTION_ISA_COMBINED because one PCD PcdComponentNameDisable has been introduced.

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

2 files changed, 13 insertions, 26 deletions

diff --git a/EdkModulePkg/Bus/Pci/IdeBus/Dxe/ComponentName.h b/EdkModulePkg/Bus/Pci/IdeBus/Dxe/ComponentName.h
index 4466f6a3a0..e6bf11f209 100644
--- a/EdkModulePkg/Bus/Pci/IdeBus/Dxe/ComponentName.h
+++ b/EdkModulePkg/Bus/Pci/IdeBus/Dxe/ComponentName.h
@@ -1,31 +1,22 @@
 /** @file

-  Copyright (c) 2006, Intel Corporation                                                         

-  All rights reserved. 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        

-  http://opensource.org/licenses/bsd-license.php                                            

+  Copyright (c) 2006, Intel Corporation

+  All rights reserved. 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

+  http://opensource.org/licenses/bsd-license.php

 

-  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     

-  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             

+  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,

+  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.

 

 **/

 

 #ifndef _IDE_BUS_COMPONENT_NAME_H

 #define _IDE_BUS_COMPONENT_NAME_H

 

-

-#ifndef EFI_SIZE_REDUCTION_APPLIED

-

 #define ADD_NAME(x) AddName ((x));

 

 extern EFI_COMPONENT_NAME_PROTOCOL  gIDEBusComponentName;

 

-#else

-

-#define ADD_NAME(x)

-

-#endif

-

 

 //

 // EFI Component Name Functions

diff --git a/EdkModulePkg/Bus/Pci/PciBus/Dxe/ComponentName.h b/EdkModulePkg/Bus/Pci/PciBus/Dxe/ComponentName.h
index 87d44c8427..0e5dbdeff8 100644
--- a/EdkModulePkg/Bus/Pci/PciBus/Dxe/ComponentName.h
+++ b/EdkModulePkg/Bus/Pci/PciBus/Dxe/ComponentName.h
@@ -1,11 +1,11 @@
 /*++

 

-Copyright (c) 2006, Intel Corporation                                                         

-All rights reserved. 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        

-http://opensource.org/licenses/bsd-license.php                                            

-                                                                                          

+Copyright (c) 2006, Intel Corporation

+All rights reserved. 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

+http://opensource.org/licenses/bsd-license.php

+

 THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     

 WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             

 

@@ -23,12 +23,8 @@ Revision History
 #ifndef _EFI_PCI_BUS_COMPONENT_NAME_H

 #define _EFI_PCI_BUS_COMPONENT_NAME_H

 

-#ifndef EFI_SIZE_REDUCTION_APPLIED

-

 extern EFI_COMPONENT_NAME_PROTOCOL  gPciBusComponentName;

 

-#endif

-

 //

 // EFI Component Name Functions

 //