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/aten.c b/drivers/block/paride/aten.c
index c4d696d43dc1..2695465568ad 100644
--- a/drivers/block/paride/aten.c
+++ b/drivers/block/paride/aten.c
@@ -149,12 +149,12 @@ static struct pi_protocol aten = {
 
 static int __init aten_init(void)
 {
-        return pi_register(&aten)-1;
+        return paride_register(&aten);
 }
 
 static void __exit aten_exit(void)
 {
-        pi_unregister( &aten );
+        paride_unregister( &aten );
 }
 
 MODULE_LICENSE("GPL");