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/bpck.c b/drivers/block/paride/bpck.c
index d462ff6b139d..4f27e7392e38 100644
--- a/drivers/block/paride/bpck.c
+++ b/drivers/block/paride/bpck.c
@@ -464,12 +464,12 @@ static struct pi_protocol bpck = {
 
 static int __init bpck_init(void)
 {
-        return pi_register(&bpck)-1;
+        return paride_register(&bpck);
 }
 
 static void __exit bpck_exit(void)
 {
-        pi_unregister(&bpck);
+        paride_unregister(&bpck);
 }
 
 MODULE_LICENSE("GPL");