diff --git a/src/arch/i386/boot/pirq_routing.c b/src/arch/i386/boot/pirq_routing.c
index 0c6269da55..86a3500444 100644
--- a/src/arch/i386/boot/pirq_routing.c
+++ b/src/arch/i386/boot/pirq_routing.c
@@ -3,10 +3,6 @@
 #include <string.h>
 #include <device/pci.h>
 
-#ifndef CONFIG_IRQ_SLOT_COUNT
-#warning "CONFIG_IRQ_SLOT_COUNT is not defined. PIRQ won't work correctly."
-#endif
-
 #if CONFIG_DEBUG
 static void check_pirq_routing_table(struct irq_routing_table *rt)
 {
diff --git a/src/arch/i386/include/arch/pirq_routing.h b/src/arch/i386/include/arch/pirq_routing.h
index b58b390afe..0b65eac29b 100644
--- a/src/arch/i386/include/arch/pirq_routing.h
+++ b/src/arch/i386/include/arch/pirq_routing.h
@@ -17,8 +17,8 @@ struct irq_info {
 	u8 rfu;
 } __attribute__((packed));
 
-#if !defined(CONFIG_IRQ_SLOT_COUNT)
-#error "No IRQ_SLOT_COUNT in Kconfig."
+#ifndef CONFIG_IRQ_SLOT_COUNT
+#warning "IRQ_SLOT_COUNT is not defined in Kconfig. PIRQ won't work correctly."
 #endif
 
 struct irq_routing_table {
diff --git a/src/mainboard/msi/ms9652_fam10/Kconfig b/src/mainboard/msi/ms9652_fam10/Kconfig
index 7b71295741..5e45051d45 100644
--- a/src/mainboard/msi/ms9652_fam10/Kconfig
+++ b/src/mainboard/msi/ms9652_fam10/Kconfig
@@ -42,9 +42,11 @@ config GENERATE_PIRQ_TABLE
 	default y
 	depends on BOARD_MSI_MS9652_FAM10
 
-config CONFIG_IRQ_SLOT_COUNT
-	hex
-	default 0x0b
+# Define to 0 because the IRQ slot count is
+# determined dynamically for this board.
+config IRQ_SLOT_COUNT
+	int
+	default 0
 	depends on BOARD_MSI_MS9652_FAM10
 
 config HAVE_OPTION_TABLE