Merge ../linux-2.6

[safe/jmp/linux-2.6] / drivers / macintosh / adbhid.c

diff --git a/drivers/macintosh/adbhid.c b/drivers/macintosh/adbhid.c
index 0a4c680..394334e 100644 (file)
--- a/drivers/macintosh/adbhid.c
+++ b/drivers/macintosh/adbhid.c
@@ -1214,7 +1214,8 @@ static int __init adbhid_init(void)
 
        adbhid_probe();
 
-       notifier_chain_register(&adb_client_list, &adbhid_adb_notifier);
+       blocking_notifier_chain_register(&adb_client_list,
+                       &adbhid_adb_notifier);
 
        return 0;
 }