5 files changed, 5 insertions, 25 deletions
diff --git a/src/mainboard/amd/bilby/mainboard.c b/src/mainboard/amd/bilby/mainboard.c
index f87046acb3..c402c29a2f 100644
--- a/src/mainboard/amd/bilby/mainboard.c
+++ b/src/mainboard/amd/bilby/mainboard.c
@@ -33,11 +33,7 @@ static uint8_t fch_apic_routing[0x80];
 _Static_assert(sizeof(fch_pic_routing) == sizeof(fch_apic_routing),
 	"PIC and APIC FCH interrupt tables must be the same size");
 
-static const struct fch_irq_routing {
-	uint8_t intr_index;
-	uint8_t pic_irq_num;
-	uint8_t apic_irq_num;
-} bilby_fch[] = {
+static const struct fch_irq_routing bilby_fch[] = {
 	{ PIRQ_A,	8,		16 },
 	{ PIRQ_B,	10,		17 },
 	{ PIRQ_C,	11,		18 },
diff --git a/src/mainboard/amd/birman/mainboard.c b/src/mainboard/amd/birman/mainboard.c
index ffb778cf4e..34c3b4dead 100644
--- a/src/mainboard/amd/birman/mainboard.c
+++ b/src/mainboard/amd/birman/mainboard.c
@@ -34,11 +34,7 @@ _Static_assert(sizeof(fch_pic_routing) == sizeof(fch_apic_routing),
  *  8: rtc0 <- soc/amd/common/acpi/lpc.asl
  *  9: acpi <- soc/amd/common/acpi/lpc.asl
  */
-static const struct fch_irq_routing {
-	uint8_t intr_index;
-	uint8_t pic_irq_num;
-	uint8_t apic_irq_num;
-} birman_fch[] = {
+static const struct fch_irq_routing birman_fch[] = {
 	{ PIRQ_A,	12,		PIRQ_NC },
 	{ PIRQ_B,	14,		PIRQ_NC },
 	{ PIRQ_C,	15,		PIRQ_NC },
diff --git a/src/mainboard/amd/chausie/mainboard.c b/src/mainboard/amd/chausie/mainboard.c
index 2966b554b3..9251ff2c91 100644
--- a/src/mainboard/amd/chausie/mainboard.c
+++ b/src/mainboard/amd/chausie/mainboard.c
@@ -32,11 +32,7 @@ _Static_assert(sizeof(fch_pic_routing) == sizeof(fch_apic_routing),
  *  8: rtc0 <- soc/amd/common/acpi/lpc.asl
  *  9: acpi <- soc/amd/common/acpi/lpc.asl
  */
-static const struct fch_irq_routing {
-	uint8_t intr_index;
-	uint8_t pic_irq_num;
-	uint8_t apic_irq_num;
-} chausie_fch[] = {
+static const struct fch_irq_routing chausie_fch[] = {
 	{ PIRQ_A,	12,		PIRQ_NC },
 	{ PIRQ_B,	14,		PIRQ_NC },
 	{ PIRQ_C,	15,		PIRQ_NC },
diff --git a/src/mainboard/amd/majolica/mainboard.c b/src/mainboard/amd/majolica/mainboard.c
index 199cf4702e..58f754655f 100644
--- a/src/mainboard/amd/majolica/mainboard.c
+++ b/src/mainboard/amd/majolica/mainboard.c
@@ -31,11 +31,7 @@ _Static_assert(sizeof(fch_pic_routing) == sizeof(fch_apic_routing),
  *  8: rtc0 <- soc/amd/common/acpi/lpc.asl
  *  9: acpi <- soc/amd/common/acpi/lpc.asl
  */
-static const struct fch_irq_routing {
-	uint8_t intr_index;
-	uint8_t pic_irq_num;
-	uint8_t apic_irq_num;
-} majolica_fch[] = {
+static const struct fch_irq_routing majolica_fch[] = {
 	{ PIRQ_A,	12,		PIRQ_NC },
 	{ PIRQ_B,	14,		PIRQ_NC },
 	{ PIRQ_C,	15,		PIRQ_NC },
diff --git a/src/mainboard/amd/mandolin/mainboard.c b/src/mainboard/amd/mandolin/mainboard.c
index ccea7c7ee4..0f87d9c799 100644
--- a/src/mainboard/amd/mandolin/mainboard.c
+++ b/src/mainboard/amd/mandolin/mainboard.c
@@ -28,11 +28,7 @@ static uint8_t fch_apic_routing[0x80];
 _Static_assert(sizeof(fch_pic_routing) == sizeof(fch_apic_routing),
 	"PIC and APIC FCH interrupt tables must be the same size");
 
-static const struct fch_irq_routing {
-	uint8_t intr_index;
-	uint8_t pic_irq_num;
-	uint8_t apic_irq_num;
-} mandolin_fch[] = {
+static const struct fch_irq_routing mandolin_fch[] = {
 	{ PIRQ_A,	8,		16 },
 	{ PIRQ_B,	10,		17 },
 	{ PIRQ_C,	11,		18 },