diff --git a/[refs] b/[refs] index 98871766f2fd..412a6d0ed70e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f4d994b541198446fc3d5d4ec5de232e171bf6dd +refs/heads/master: ae28d70529b874f657afd0f70ca148599345ba2a diff --git a/trunk/arch/x86/pci/visws.c b/trunk/arch/x86/pci/visws.c index c2df4e97eed6..c3dc9f26812c 100644 --- a/trunk/arch/x86/pci/visws.c +++ b/trunk/arch/x86/pci/visws.c @@ -85,7 +85,7 @@ void __init pcibios_update_irq(struct pci_dev *dev, int irq) pci_write_config_byte(dev, PCI_INTERRUPT_LINE, irq); } -static int __init pcibios_init(void) +static int __init pci_visws_init(void) { /* The VISWS supports configuration access type 1 only */ pci_probe = (pci_probe | PCI_PROBE_CONF1) & @@ -105,4 +105,4 @@ static int __init pcibios_init(void) return 0; } -subsys_initcall(pcibios_init); +subsys_initcall(pci_visws_init);