diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2007-02-05 08:25:21 -0500 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2007-02-05 08:25:21 -0500 |
| commit | 4285431fb658263e98942ce2320b0b26eddcc06d (patch) | |
| tree | 49bce2d36917cb628ccddee55a47026da2ed90db /drivers/ide/pci/pdc202xx_old.c | |
| parent | c033a7e3d593554ba5e8a0e63bf7e5874dc3e92f (diff) | |
| parent | 62d0cfcb27cf755cebdc93ca95dabc83608007cd (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/ide/pci/pdc202xx_old.c')
| -rw-r--r-- | drivers/ide/pci/pdc202xx_old.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ide/pci/pdc202xx_old.c b/drivers/ide/pci/pdc202xx_old.c index 184cdacddeb6..143239c093d5 100644 --- a/drivers/ide/pci/pdc202xx_old.c +++ b/drivers/ide/pci/pdc202xx_old.c | |||
| @@ -719,7 +719,7 @@ static struct pci_driver driver = { | |||
| 719 | .probe = pdc202xx_init_one, | 719 | .probe = pdc202xx_init_one, |
| 720 | }; | 720 | }; |
| 721 | 721 | ||
| 722 | static int pdc202xx_ide_init(void) | 722 | static int __init pdc202xx_ide_init(void) |
| 723 | { | 723 | { |
| 724 | return ide_pci_register_driver(&driver); | 724 | return ide_pci_register_driver(&driver); |
| 725 | } | 725 | } |