diff options
Diffstat (limited to 'arch/x86/pci')
-rw-r--r-- | arch/x86/pci/Makefile | 2 | ||||
-rw-r--r-- | arch/x86/pci/visws.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/arch/x86/pci/Makefile b/arch/x86/pci/Makefile index 99d9f095e4d4..fa0164d80bbd 100644 --- a/arch/x86/pci/Makefile +++ b/arch/x86/pci/Makefile | |||
@@ -11,7 +11,7 @@ pci-y += legacy.o irq.o | |||
11 | 11 | ||
12 | # Careful: VISWS overrule the pci-y above. The colons are | 12 | # Careful: VISWS overrule the pci-y above. The colons are |
13 | # therefor correct. This needs a proper fix by distangling the code. | 13 | # therefor correct. This needs a proper fix by distangling the code. |
14 | pci-$(CONFIG_X86_VISWS) := visws.o fixup.o | 14 | #pci-$(CONFIG_X86_VISWS) := visws.o irq.o fixup.o |
15 | 15 | ||
16 | pci-$(CONFIG_X86_NUMAQ) += numa.o | 16 | pci-$(CONFIG_X86_NUMAQ) += numa.o |
17 | 17 | ||
diff --git a/arch/x86/pci/visws.c b/arch/x86/pci/visws.c index 16e52063ecb3..343ccf668d14 100644 --- a/arch/x86/pci/visws.c +++ b/arch/x86/pci/visws.c | |||
@@ -16,10 +16,10 @@ | |||
16 | static int pci_visws_enable_irq(struct pci_dev *dev) { return 0; } | 16 | static int pci_visws_enable_irq(struct pci_dev *dev) { return 0; } |
17 | static void pci_visws_disable_irq(struct pci_dev *dev) { } | 17 | static void pci_visws_disable_irq(struct pci_dev *dev) { } |
18 | 18 | ||
19 | int (*pcibios_enable_irq)(struct pci_dev *dev) = &pci_visws_enable_irq; | 19 | /* int (*pcibios_enable_irq)(struct pci_dev *dev) = &pci_visws_enable_irq; */ |
20 | void (*pcibios_disable_irq)(struct pci_dev *dev) = &pci_visws_disable_irq; | 20 | /* void (*pcibios_disable_irq)(struct pci_dev *dev) = &pci_visws_disable_irq; */ |
21 | 21 | ||
22 | void __init pcibios_penalize_isa_irq(int irq, int active) {} | 22 | /* void __init pcibios_penalize_isa_irq(int irq, int active) {} */ |
23 | 23 | ||
24 | 24 | ||
25 | unsigned int pci_bus0, pci_bus1; | 25 | unsigned int pci_bus0, pci_bus1; |