git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
x86: Add pci_init_irq to x86_init
[pandora-kernel.git]
/
arch
/
x86
/
pci
/
acpi.c
diff --git
a/arch/x86/pci/acpi.c
b/arch/x86/pci/acpi.c
index
959e548
..
b53f048
100644
(file)
--- a/
arch/x86/pci/acpi.c
+++ b/
arch/x86/pci/acpi.c
@@
-282,17
+282,14
@@
int __init pci_acpi_init(void)
{
struct pci_dev *dev = NULL;
{
struct pci_dev *dev = NULL;
- if (pcibios_scanned)
- return 0;
-
if (acpi_noirq)
if (acpi_noirq)
- return
0
;
+ return
-ENODEV
;
printk(KERN_INFO "PCI: Using ACPI for IRQ routing\n");
acpi_irq_penalty_init();
printk(KERN_INFO "PCI: Using ACPI for IRQ routing\n");
acpi_irq_penalty_init();
- pcibios_scanned++;
pcibios_enable_irq = acpi_pci_irq_enable;
pcibios_disable_irq = acpi_pci_irq_disable;
pcibios_enable_irq = acpi_pci_irq_enable;
pcibios_disable_irq = acpi_pci_irq_disable;
+ x86_init.pci.init_irq = x86_init_noop;
if (pci_routeirq) {
/*
if (pci_routeirq) {
/*