diff options
Diffstat (limited to 'drivers/macintosh/adb.c')
-rw-r--r-- | drivers/macintosh/adb.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/macintosh/adb.c b/drivers/macintosh/adb.c index 493e2afa191c..c0dc1e3fa58b 100644 --- a/drivers/macintosh/adb.c +++ b/drivers/macintosh/adb.c | |||
@@ -90,7 +90,7 @@ static int sleepy_trackpad; | |||
90 | static int autopoll_devs; | 90 | static int autopoll_devs; |
91 | int __adb_probe_sync; | 91 | int __adb_probe_sync; |
92 | 92 | ||
93 | #ifdef CONFIG_PMAC_PBOOK | 93 | #ifdef CONFIG_PM |
94 | static int adb_notify_sleep(struct pmu_sleep_notifier *self, int when); | 94 | static int adb_notify_sleep(struct pmu_sleep_notifier *self, int when); |
95 | static struct pmu_sleep_notifier adb_sleep_notifier = { | 95 | static struct pmu_sleep_notifier adb_sleep_notifier = { |
96 | adb_notify_sleep, | 96 | adb_notify_sleep, |
@@ -320,9 +320,9 @@ int __init adb_init(void) | |||
320 | printk(KERN_WARNING "Warning: no ADB interface detected\n"); | 320 | printk(KERN_WARNING "Warning: no ADB interface detected\n"); |
321 | adb_controller = NULL; | 321 | adb_controller = NULL; |
322 | } else { | 322 | } else { |
323 | #ifdef CONFIG_PMAC_PBOOK | 323 | #ifdef CONFIG_PM |
324 | pmu_register_sleep_notifier(&adb_sleep_notifier); | 324 | pmu_register_sleep_notifier(&adb_sleep_notifier); |
325 | #endif /* CONFIG_PMAC_PBOOK */ | 325 | #endif /* CONFIG_PM */ |
326 | #ifdef CONFIG_PPC | 326 | #ifdef CONFIG_PPC |
327 | if (machine_is_compatible("AAPL,PowerBook1998") || | 327 | if (machine_is_compatible("AAPL,PowerBook1998") || |
328 | machine_is_compatible("PowerBook1,1")) | 328 | machine_is_compatible("PowerBook1,1")) |
@@ -337,7 +337,7 @@ int __init adb_init(void) | |||
337 | 337 | ||
338 | __initcall(adb_init); | 338 | __initcall(adb_init); |
339 | 339 | ||
340 | #ifdef CONFIG_PMAC_PBOOK | 340 | #ifdef CONFIG_PM |
341 | /* | 341 | /* |
342 | * notify clients before sleep and reset bus afterwards | 342 | * notify clients before sleep and reset bus afterwards |
343 | */ | 343 | */ |
@@ -378,7 +378,7 @@ adb_notify_sleep(struct pmu_sleep_notifier *self, int when) | |||
378 | } | 378 | } |
379 | return PBOOK_SLEEP_OK; | 379 | return PBOOK_SLEEP_OK; |
380 | } | 380 | } |
381 | #endif /* CONFIG_PMAC_PBOOK */ | 381 | #endif /* CONFIG_PM */ |
382 | 382 | ||
383 | static int | 383 | static int |
384 | do_adb_reset_bus(void) | 384 | do_adb_reset_bus(void) |