4 files changed, 2 insertions, 16 deletions
diff --git a/src/northbridge/amd/amdfam10/Config.lb b/src/northbridge/amd/amdfam10/Config.lb
index 2ddbc6fa26..5e9081991d 100644
--- a/src/northbridge/amd/amdfam10/Config.lb
+++ b/src/northbridge/amd/amdfam10/Config.lb
@@ -17,15 +17,12 @@
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 #
 
-uses CONFIG_CHIP_NAME
 uses AGP_APERTURE_SIZE
 uses HAVE_ACPI_TABLES
 
 default AGP_APERTURE_SIZE=0x4000000
 
-if CONFIG_CHIP_NAME
-	config chip.h
-end
+config chip.h
 
 driver northbridge.o
 driver misc_control.o
diff --git a/src/northbridge/amd/amdfam10/northbridge.c b/src/northbridge/amd/amdfam10/northbridge.c
index 95e09f4c6a..92f9ea3819 100644
--- a/src/northbridge/amd/amdfam10/northbridge.c
+++ b/src/northbridge/amd/amdfam10/northbridge.c
@@ -652,15 +652,11 @@ static struct pci_driver mcf0_driver __pci_driver = {
 	.device = 0x1200,
 };
 
-#if CONFIG_CHIP_NAME == 1
-
 struct chip_operations northbridge_amd_amdfam10_ops = {
 	CHIP_NAME("AMD FAM10 Northbridge")
 	.enable_dev = 0,
 };
 
-#endif
-
 static void pci_domain_read_resources(device_t dev)
 {
 	struct resource *resource;
diff --git a/src/northbridge/amd/amdk8/Config.lb b/src/northbridge/amd/amdk8/Config.lb
index 99bb337963..272c7fdc62 100644
--- a/src/northbridge/amd/amdk8/Config.lb
+++ b/src/northbridge/amd/amdk8/Config.lb
@@ -1,12 +1,9 @@
-uses CONFIG_CHIP_NAME
 uses AGP_APERTURE_SIZE
 uses HAVE_ACPI_TABLES
 
 default AGP_APERTURE_SIZE=0x4000000
 
-if CONFIG_CHIP_NAME
-	config chip.h
-end
+config chip.h
 
 driver northbridge.o
 driver misc_control.o
diff --git a/src/northbridge/amd/amdk8/northbridge.c b/src/northbridge/amd/amdk8/northbridge.c
index 59cbbff4d0..ac9dc20634 100644
--- a/src/northbridge/amd/amdk8/northbridge.c
+++ b/src/northbridge/amd/amdk8/northbridge.c
@@ -629,15 +629,11 @@ static const struct pci_driver mcf0_driver __pci_driver = {
 	.device = 0x1100,
 };
 
-#if CONFIG_CHIP_NAME == 1
-
 struct chip_operations northbridge_amd_amdk8_ops = {
 	CHIP_NAME("AMD K8 Northbridge")
 	.enable_dev = 0,
 };
 
-#endif
-
 static void pci_domain_read_resources(device_t dev)
 {
 	struct resource *resource;