diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-03-29 04:24:50 +0200 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-03-29 04:24:50 +0200 |
| commit | bac30d1a78d0f11c613968fc8b351a91ed465386 (patch) | |
| tree | e52f3c876522a2f6047a6ec1c27df2e8a79486b8 /drivers/macintosh/via-pmu68k.c | |
| parent | [PATCH] powerpc: Kill _machine and hard-coded platform numbers (diff) | |
| parent | Merge master.kernel.org:/home/rmk/linux-2.6-arm (diff) | |
| download | linux-bac30d1a78d0f11c613968fc8b351a91ed465386.tar.xz linux-bac30d1a78d0f11c613968fc8b351a91ed465386.zip | |
Merge ../linux-2.6
Diffstat (limited to 'drivers/macintosh/via-pmu68k.c')
| -rw-r--r-- | drivers/macintosh/via-pmu68k.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/macintosh/via-pmu68k.c b/drivers/macintosh/via-pmu68k.c index f08e52f2107b..35b70323e7e3 100644 --- a/drivers/macintosh/via-pmu68k.c +++ b/drivers/macintosh/via-pmu68k.c @@ -102,7 +102,7 @@ static int pmu_kind = PMU_UNKNOWN; static int pmu_fully_inited = 0; int asleep; -struct notifier_block *sleep_notifier_list; +BLOCKING_NOTIFIER_HEAD(sleep_notifier_list); static int pmu_probe(void); static int pmu_init(void); @@ -913,7 +913,8 @@ int powerbook_sleep(void) struct adb_request sleep_req; /* Notify device drivers */ - ret = notifier_call_chain(&sleep_notifier_list, PBOOK_SLEEP, NULL); + ret = blocking_notifier_call_chain(&sleep_notifier_list, + PBOOK_SLEEP, NULL); if (ret & NOTIFY_STOP_MASK) return -EBUSY; @@ -984,7 +985,7 @@ int powerbook_sleep(void) enable_irq(i); /* Notify drivers */ - notifier_call_chain(&sleep_notifier_list, PBOOK_WAKE, NULL); + blocking_notifier_call_chain(&sleep_notifier_list, PBOOK_WAKE, NULL); /* reenable ADB autopoll */ pmu_adb_autopoll(adb_dev_map); |