git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
linux 2.6.16.38 w/ vs2.0.3-rc1
[linux-2.6.git]
/
drivers
/
macintosh
/
via-pmu68k.c
diff --git
a/drivers/macintosh/via-pmu68k.c
b/drivers/macintosh/via-pmu68k.c
index
35b7032
..
f08e52f
100644
(file)
--- 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;
static int pmu_fully_inited = 0;
int asleep;
-
BLOCKING_NOTIFIER_HEAD(sleep_notifier_list)
;
+
struct notifier_block *sleep_notifier_list
;
static int pmu_probe(void);
static int pmu_init(void);
static int pmu_probe(void);
static int pmu_init(void);
@@
-913,8
+913,7
@@
int powerbook_sleep(void)
struct adb_request sleep_req;
/* Notify device drivers */
struct adb_request sleep_req;
/* Notify device drivers */
- ret = blocking_notifier_call_chain(&sleep_notifier_list,
- PBOOK_SLEEP, NULL);
+ ret = notifier_call_chain(&sleep_notifier_list, PBOOK_SLEEP, NULL);
if (ret & NOTIFY_STOP_MASK)
return -EBUSY;
if (ret & NOTIFY_STOP_MASK)
return -EBUSY;
@@
-985,7
+984,7
@@
int powerbook_sleep(void)
enable_irq(i);
/* Notify drivers */
enable_irq(i);
/* Notify drivers */
-
blocking_
notifier_call_chain(&sleep_notifier_list, PBOOK_WAKE, NULL);
+ notifier_call_chain(&sleep_notifier_list, PBOOK_WAKE, NULL);
/* reenable ADB autopoll */
pmu_adb_autopoll(adb_dev_map);
/* reenable ADB autopoll */
pmu_adb_autopoll(adb_dev_map);