diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2007-07-11 09:55:48 -0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2007-07-11 09:55:48 -0400 |
| commit | db1b39d8b860e3716620c225bc86e0ec41764e34 (patch) | |
| tree | 8739074db733ef767400ea92cfbfed9352ddb92d /drivers/net/sunhme.c | |
| parent | a6bc432e296dfa1f05d4b586ca5ca3085a2d42d7 (diff) | |
| parent | 4eb6bf6bfb580afaf1e1a1d30cba17a078530cf4 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/net/sunhme.c')
| -rw-r--r-- | drivers/net/sunhme.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/sunhme.c b/drivers/net/sunhme.c index 51c3fe2108a3..15146a119230 100644 --- a/drivers/net/sunhme.c +++ b/drivers/net/sunhme.c | |||
| @@ -2625,7 +2625,7 @@ static void quattro_sbus_free_irqs(void) | |||
| 2625 | #endif /* CONFIG_SBUS */ | 2625 | #endif /* CONFIG_SBUS */ |
| 2626 | 2626 | ||
| 2627 | #ifdef CONFIG_PCI | 2627 | #ifdef CONFIG_PCI |
| 2628 | static struct quattro * __init quattro_pci_find(struct pci_dev *pdev) | 2628 | static struct quattro * __devinit quattro_pci_find(struct pci_dev *pdev) |
| 2629 | { | 2629 | { |
| 2630 | struct pci_dev *bdev = pdev->bus->self; | 2630 | struct pci_dev *bdev = pdev->bus->self; |
| 2631 | struct quattro *qp; | 2631 | struct quattro *qp; |