Merge commit 'v2.6.28-rc2' into tracing/urgent

[mv-sheeva.git] / drivers / block / paride / on20.c

diff --git a/drivers/block/paride/on20.c b/drivers/block/paride/on20.c
index 9f8e01096809aaf069971adb7ca9a003caa97b1e..0173697a1a4d5d9d474f14553e3d350ec0195b7e 100644 (file)
--- a/drivers/block/paride/on20.c
+++ b/drivers/block/paride/on20.c
@@ -140,12 +140,12 @@ static struct pi_protocol on20 = {
 
 static int __init on20_init(void)
 {
-       return pi_register(&on20)-1;
+       return paride_register(&on20);
 }
 
 static void __exit on20_exit(void)
 {
-       pi_unregister(&on20);
+       paride_unregister(&on20);
 }
 
 MODULE_LICENSE("GPL");