aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ide/pci/ns87415.c
diff options
context:
space:
mode:
authorDavid Woodhouse <dwmw2@infradead.org>2007-02-05 13:25:21 +0000
committerDavid Woodhouse <dwmw2@infradead.org>2007-02-05 13:25:21 +0000
commit4285431fb658263e98942ce2320b0b26eddcc06d (patch)
tree49bce2d36917cb628ccddee55a47026da2ed90db /drivers/ide/pci/ns87415.c
parentc033a7e3d593554ba5e8a0e63bf7e5874dc3e92f (diff)
parent62d0cfcb27cf755cebdc93ca95dabc83608007cd (diff)
downloadkernel_samsung_tuna-4285431fb658263e98942ce2320b0b26eddcc06d.zip
kernel_samsung_tuna-4285431fb658263e98942ce2320b0b26eddcc06d.tar.gz
kernel_samsung_tuna-4285431fb658263e98942ce2320b0b26eddcc06d.tar.bz2
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/ide/pci/ns87415.c')
-rw-r--r--drivers/ide/pci/ns87415.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ide/pci/ns87415.c b/drivers/ide/pci/ns87415.c
index d95714b..8aaea4e 100644
--- a/drivers/ide/pci/ns87415.c
+++ b/drivers/ide/pci/ns87415.c
@@ -302,7 +302,7 @@ static struct pci_driver driver = {
.probe = ns87415_init_one,
};
-static int ns87415_ide_init(void)
+static int __init ns87415_ide_init(void)
{
return ide_pci_register_driver(&driver);
}