From bcfc075ed35fc66abf298ef5db51e350393e99a2 Mon Sep 17 00:00:00 2001
From: "Rafael J. Wysocki" <rjw@sisk.pl>
Date: Wed, 23 Jul 2008 21:28:35 -0700
Subject: [PATCH] --- yaml --- r: 105359 b: refs/heads/master c:
 558481f038e587b22d02167af58914c814ce9de5 h: refs/heads/master i:   105357:
 0e0cb4b116128220f01b621a1255355bc44269a2   105355:
 d7248405cc9432e5d9d4c3fae27293dd50be41e1   105351:
 1a3011719027f5c540fe5f83a85a920fde67ddca   105343:
 11d0fd92e355e186cea7ea855195a8a8e4ec2218 v: v3

---
 [refs]                   |  2 +-
 trunk/include/linux/pm.h | 24 ------------------------
 2 files changed, 1 insertion(+), 25 deletions(-)

diff --git a/[refs] b/[refs]
index bd2854ed463a..ad298dadebc3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d75f65fd247fe85d90a3880d143b1bb22fe13a48
+refs/heads/master: 558481f038e587b22d02167af58914c814ce9de5
diff --git a/trunk/include/linux/pm.h b/trunk/include/linux/pm.h
index 4ad9de94449a..5bf1ce89cfbb 100644
--- a/trunk/include/linux/pm.h
+++ b/trunk/include/linux/pm.h
@@ -68,30 +68,6 @@ enum
  */
 #define PM_PCI_ID(dev) ((dev)->bus->number << 16 | (dev)->devfn)
 
-/*
- * Request handler callback
- */
-struct pm_dev;
-
-typedef int (*pm_callback)(struct pm_dev *dev, pm_request_t rqst, void *data);
-
-/*
- * Dynamic device information
- */
-struct pm_dev
-{
-	pm_dev_t	 type;
-	unsigned long	 id;
-	pm_callback	 callback;
-	void		*data;
-
-	unsigned long	 flags;
-	unsigned long	 state;
-	unsigned long	 prev_state;
-
-	struct list_head entry;
-};
-
 /* Functions above this comment are list-based old-style power
  * management. Please avoid using them.  */