diff --git a/[refs] b/[refs] index 4e15a5077d4f..f2dfa7e18c3b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c2edacf80e155ef54ae4774379d461b60896bc2e +refs/heads/master: cd6f5b8051efe03b90a1dd6d63a642f78ec4e60d diff --git a/trunk/drivers/net/sunhme.c b/trunk/drivers/net/sunhme.c index 51c3fe2108a3..15146a119230 100644 --- a/trunk/drivers/net/sunhme.c +++ b/trunk/drivers/net/sunhme.c @@ -2625,7 +2625,7 @@ static void quattro_sbus_free_irqs(void) #endif /* CONFIG_SBUS */ #ifdef CONFIG_PCI -static struct quattro * __init quattro_pci_find(struct pci_dev *pdev) +static struct quattro * __devinit quattro_pci_find(struct pci_dev *pdev) { struct pci_dev *bdev = pdev->bus->self; struct quattro *qp;