Removed EFI_SIZE_REDUCTION_APPLIED and SIZE_REDUCTION_ISA_COMBINED because one PCD...

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

diff --git a/EdkModulePkg/Bus/Pci/IdeBus/Dxe/ComponentName.h b/EdkModulePkg/Bus/Pci/IdeBus/Dxe/ComponentName.h
index 4466f6a3a03fbae1a581f9edb9c9a86219c62e74..e6bf11f209be9e87a11a08bbda3288c28b33afaa 100644 (file)
--- a/EdkModulePkg/Bus/Pci/IdeBus/Dxe/ComponentName.h
+++ b/EdkModulePkg/Bus/Pci/IdeBus/Dxe/ComponentName.h
@@ -1,31 +1,22 @@
 /** @file\r
-  Copyright (c) 2006, Intel Corporation                                                         \r
-  All rights reserved. This program and the accompanying materials                          \r
-  are licensed and made available under the terms and conditions of the BSD License         \r
-  which accompanies this distribution.  The full text of the license may be found at        \r
-  http://opensource.org/licenses/bsd-license.php                                            \r
+  Copyright (c) 2006, Intel Corporation\r
+  All rights reserved. This program and the accompanying materials\r
+  are licensed and made available under the terms and conditions of the BSD License\r
+  which accompanies this distribution.  The full text of the license may be found at\r
+  http://opensource.org/licenses/bsd-license.php\r
 \r
-  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
-  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             \r
+  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
+  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 \r
 **/\r
 \r
 #ifndef _IDE_BUS_COMPONENT_NAME_H\r
 #define _IDE_BUS_COMPONENT_NAME_H\r
 \r
-\r
-#ifndef EFI_SIZE_REDUCTION_APPLIED\r
-\r
 #define ADD_NAME(x) AddName ((x));\r
 \r
 extern EFI_COMPONENT_NAME_PROTOCOL  gIDEBusComponentName;\r
 \r
-#else\r
-\r
-#define ADD_NAME(x)\r
-\r
-#endif\r
-\r
 \r
 //\r
 // EFI Component Name Functions\r

diff --git a/EdkModulePkg/Bus/Pci/PciBus/Dxe/ComponentName.h b/EdkModulePkg/Bus/Pci/PciBus/Dxe/ComponentName.h
index 87d44c8427a473dc7d759dda36fd463ea0ed9fbb..0e5dbdeff8cf7abcc7a15804e3fcad17f3ca451b 100644 (file)
--- a/EdkModulePkg/Bus/Pci/PciBus/Dxe/ComponentName.h
+++ b/EdkModulePkg/Bus/Pci/PciBus/Dxe/ComponentName.h
@@ -1,11 +1,11 @@
 /*++\r
 \r
-Copyright (c) 2006, Intel Corporation                                                         \r
-All rights reserved. This program and the accompanying materials                          \r
-are licensed and made available under the terms and conditions of the BSD License         \r
-which accompanies this distribution.  The full text of the license may be found at        \r
-http://opensource.org/licenses/bsd-license.php                                            \r
-                                                                                          \r
+Copyright (c) 2006, Intel Corporation\r
+All rights reserved. This program and the accompanying materials\r
+are licensed and made available under the terms and conditions of the BSD License\r
+which accompanies this distribution.  The full text of the license may be found at\r
+http://opensource.org/licenses/bsd-license.php\r
+\r
 THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
 WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             \r
 \r
@@ -23,12 +23,8 @@ Revision History
 #ifndef _EFI_PCI_BUS_COMPONENT_NAME_H\r
 #define _EFI_PCI_BUS_COMPONENT_NAME_H\r
 \r
-#ifndef EFI_SIZE_REDUCTION_APPLIED\r
-\r
 extern EFI_COMPONENT_NAME_PROTOCOL  gPciBusComponentName;\r
 \r
-#endif\r
-\r
 //\r
 // EFI Component Name Functions\r
 //\r