Merge branch 'master' of /home/trondmy/kernel/linux-2.6/ into merge_linus

1 files changed, 2 insertions, 2 deletions

diff --git a/drivers/block/paride/on26.c b/drivers/block/paride/on26.c
index 0f833caa2101..95ba256921f2 100644
--- a/drivers/block/paride/on26.c
+++ b/drivers/block/paride/on26.c
@@ -306,12 +306,12 @@ static struct pi_protocol on26 = {
 
 static int __init on26_init(void)
 {
-        return pi_register(&on26)-1;
+        return paride_register(&on26);
 }
 
 static void __exit on26_exit(void)
 {
-        pi_unregister(&on26);
+        paride_unregister(&on26);
 }
 
 MODULE_LICENSE("GPL");