diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-03-28 21:24:50 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-03-28 21:24:50 -0500 |
| commit | bac30d1a78d0f11c613968fc8b351a91ed465386 (patch) | |
| tree | e52f3c876522a2f6047a6ec1c27df2e8a79486b8 /drivers/macintosh/adbhid.c | |
| parent | e8222502ee6157e2713da9e0792c21f4ad458d50 (diff) | |
| parent | ca9ba4471c1203bb6e759b76e83167fec54fe590 (diff) | |
Merge ../linux-2.6
Diffstat (limited to 'drivers/macintosh/adbhid.c')
| -rw-r--r-- | drivers/macintosh/adbhid.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/macintosh/adbhid.c b/drivers/macintosh/adbhid.c index 0a4c680d4ac0..394334ec5765 100644 --- a/drivers/macintosh/adbhid.c +++ b/drivers/macintosh/adbhid.c | |||
| @@ -1214,7 +1214,8 @@ static int __init adbhid_init(void) | |||
| 1214 | 1214 | ||
| 1215 | adbhid_probe(); | 1215 | adbhid_probe(); |
| 1216 | 1216 | ||
| 1217 | notifier_chain_register(&adb_client_list, &adbhid_adb_notifier); | 1217 | blocking_notifier_chain_register(&adb_client_list, |
| 1218 | &adbhid_adb_notifier); | ||
| 1218 | 1219 | ||
| 1219 | return 0; | 1220 | return 0; |
| 1220 | } | 1221 | } |