aboutsummaryrefslogtreecommitdiff
path: root/arch/x86
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-07-10 16:53:21 +0200
committerIngo Molnar <mingo@elte.hu>2008-07-10 18:55:33 +0200
commit5548ed1135842d1993a4ba699377a8a3c65dd568 (patch)
tree1ae79e5f24789c87477261dc7c3f6e2a284a2097 /arch/x86
parent5ab74722a4656612d1f3b087b1afd91133ec0eeb (diff)
x86, VisWS: turn into generic arch, install proper PCI quirk
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86')
-rw-r--r--arch/x86/mach-visws/setup_visws.c5
-rw-r--r--arch/x86/pci/visws.c7
2 files changed, 11 insertions, 1 deletions
diff --git a/arch/x86/mach-visws/setup_visws.c b/arch/x86/mach-visws/setup_visws.c
index 8401208eec5..bbc149f78a4 100644
--- a/arch/x86/mach-visws/setup_visws.c
+++ b/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/arch/x86/pci/visws.c b/arch/x86/pci/visws.c
index 2e022210a63..9b883890c0b 100644
--- a/arch/x86/pci/visws.c
+++ b/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();