Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git

1 files changed, 1 insertions, 35 deletions

diff --git a/include/linux/pmu.h b/include/linux/pmu.h
index b7824c215354..4c5f65392d36 100644
--- a/include/linux/pmu.h
+++ b/include/linux/pmu.h
@@ -159,41 +159,7 @@ extern void pmu_unlock(void);
 extern int pmu_present(void);
 extern int pmu_get_model(void);
 
-#ifdef CONFIG_PM
-/*
- * Stuff for putting the powerbook to sleep and waking it again.
- *
- */
-#include <linux/list.h>
-
-struct pmu_sleep_notifier
-{
-        void (*notifier_call)(struct pmu_sleep_notifier *self, int when);
-        int priority;
-        struct list_head list;
-};
-
-/* Code values for calling sleep/wakeup handlers
- */
-#define PBOOK_SLEEP_REQUEST     1
-#define PBOOK_SLEEP_NOW         2
-#define PBOOK_WAKE              3
-
-/* priority levels in notifiers */
-#define SLEEP_LEVEL_VIDEO       100     /* Video driver (first wake) */
-#define SLEEP_LEVEL_MEDIABAY    90      /* Media bay driver */
-#define SLEEP_LEVEL_BLOCK       80      /* IDE, SCSI */
-#define SLEEP_LEVEL_NET         70      /* bmac, gmac */
-#define SLEEP_LEVEL_MISC        60      /* Anything else */
-#define SLEEP_LEVEL_USERLAND    55      /* Reserved for apm_emu */
-#define SLEEP_LEVEL_ADB         50      /* ADB (async) */
-#define SLEEP_LEVEL_SOUND       40      /* Sound driver (blocking) */
-
-/* special register notifier functions */
-int pmu_register_sleep_notifier(struct pmu_sleep_notifier* notifier);
-int pmu_unregister_sleep_notifier(struct pmu_sleep_notifier* notifier);
-
-#endif /* CONFIG_PM */
+extern void pmu_backlight_set_sleep(int sleep);
 
 #define PMU_MAX_BATTERIES       2