summaryrefslogtreecommitdiff
path: root/drivers/block/umem.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-01-10 05:41:42 +0300
committerLinus Torvalds <torvalds@g5.osdl.org>2006-01-10 05:41:42 +0300
commit977127174a7dff52d17faeeb4c4949a54221881f (patch)
treeb05b9d18a1256d7ed97bdfb537213a8d70ccca57 /drivers/block/umem.c
parent80c0531514516e43ae118ddf38424e06e5c3cb3c (diff)
parent93b47684f60cf25e8cefe19a21d94aa0257fdf36 (diff)
downloadlinux-977127174a7dff52d17faeeb4c4949a54221881f.tar.xz
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6
Diffstat (limited to 'drivers/block/umem.c')
-rw-r--r--drivers/block/umem.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/block/umem.c b/drivers/block/umem.c
index 15299e7a1ade..a3614e6a68d0 100644
--- a/drivers/block/umem.c
+++ b/drivers/block/umem.c
@@ -1174,7 +1174,7 @@ static int __init mm_init(void)
printk(KERN_INFO DRIVER_VERSION " : " DRIVER_DESC "\n");
- retval = pci_module_init(&mm_pci_driver);
+ retval = pci_register_driver(&mm_pci_driver);
if (retval)
return -ENOMEM;