diff options
author | David Woodhouse <dwmw2@infradead.org> | 2007-02-05 13:25:21 +0000 |
---|---|---|
committer | David Woodhouse <dwmw2@infradead.org> | 2007-02-05 13:25:21 +0000 |
commit | 4285431fb658263e98942ce2320b0b26eddcc06d (patch) | |
tree | 49bce2d36917cb628ccddee55a47026da2ed90db /drivers/ide/pci/sis5513.c | |
parent | c033a7e3d593554ba5e8a0e63bf7e5874dc3e92f (diff) | |
parent | 62d0cfcb27cf755cebdc93ca95dabc83608007cd (diff) | |
download | op-kernel-dev-4285431fb658263e98942ce2320b0b26eddcc06d.zip op-kernel-dev-4285431fb658263e98942ce2320b0b26eddcc06d.tar.gz |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/ide/pci/sis5513.c')
-rw-r--r-- | drivers/ide/pci/sis5513.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ide/pci/sis5513.c b/drivers/ide/pci/sis5513.c index 6b31313..1afff65 100644 --- a/drivers/ide/pci/sis5513.c +++ b/drivers/ide/pci/sis5513.c @@ -968,7 +968,7 @@ static struct pci_driver driver = { .probe = sis5513_init_one, }; -static int sis5513_ide_init(void) +static int __init sis5513_ide_init(void) { return ide_pci_register_driver(&driver); } |