diff --git a/[refs] b/[refs]
index 292cb7b6ffc7..bde01c58428c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5ab74722a4656612d1f3b087b1afd91133ec0eeb
+refs/heads/master: 5548ed1135842d1993a4ba699377a8a3c65dd568
diff --git a/trunk/arch/x86/mach-visws/setup_visws.c b/trunk/arch/x86/mach-visws/setup_visws.c
index 8401208eec5c..bbc149f78a4b 100644
--- a/trunk/arch/x86/mach-visws/setup_visws.c
+++ b/trunk/arch/x86/mach-visws/setup_visws.c
@@ -28,6 +28,11 @@
 char visws_board_type	= -1;
 char visws_board_rev	= -1;
 
+int is_visws_box(void)
+{
+	return visws_board_type >= 0;
+}
+
 static int __init visws_time_init_quirk(void)
 {
 	printk(KERN_INFO "Starting Cobalt Timer system clock\n");
diff --git a/trunk/arch/x86/pci/visws.c b/trunk/arch/x86/pci/visws.c
index 2e022210a632..9b883890c0b2 100644
--- a/trunk/arch/x86/pci/visws.c
+++ b/trunk/arch/x86/pci/visws.c
@@ -8,6 +8,7 @@
 #include <linux/pci.h>
 #include <linux/init.h>
 
+#include <asm/setup.h>
 #include "cobalt.h"
 #include "lithium.h"
 
@@ -107,7 +108,11 @@ static int __init pci_visws_init(void)
 
 static __init int pci_subsys_init(void)
 {
-	return -1;
+	if (!is_visws_box())
+		return -1;
+
+	pcibios_enable_irq = &pci_visws_enable_irq;
+	pcibios_disable_irq = &pci_visws_disable_irq;
 
 	pci_visws_init();
 	pcibios_init();
diff --git a/trunk/include/asm-x86/setup.h b/trunk/include/asm-x86/setup.h
index 1ad7eae0d9be..90ab2225e71b 100644
--- a/trunk/include/asm-x86/setup.h
+++ b/trunk/include/asm-x86/setup.h
@@ -10,8 +10,10 @@ void vsmp_init(void);
 
 #ifdef CONFIG_X86_VISWS
 extern void visws_early_detect(void);
+extern int is_visws_box(void);
 #else
 static inline void visws_early_detect(void) { }
+static inline int is_visws_box(void) { return 0; }
 #endif
 
 /*