aboutsummaryrefslogtreecommitdiff
path: root/drivers/base/power/power.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@ppc970.osdl.org>2005-05-18 16:37:46 -0700
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-05-18 16:37:46 -0700
commit05d3794aa8bd3b2c9f7920a05003c331cdeb75c5 (patch)
tree46ae0ec07caf01fa5c743112ae8ee932d1e66854 /drivers/base/power/power.h
parent301216244b1e39c4346e56d38b079ca53d528580 (diff)
parent0b405a0f7e4d4d18fd1fe46ddf5ff465443036ab (diff)
Automatic merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-2.6.git/
Diffstat (limited to 'drivers/base/power/power.h')
-rw-r--r--drivers/base/power/power.h11
1 files changed, 0 insertions, 11 deletions
diff --git a/drivers/base/power/power.h b/drivers/base/power/power.h
index e5eda746f2a..2e700d795cf 100644
--- a/drivers/base/power/power.h
+++ b/drivers/base/power/power.h
@@ -1,18 +1,7 @@
-
-
-enum {
- DEVICE_PM_ON,
- DEVICE_PM1,
- DEVICE_PM2,
- DEVICE_PM3,
- DEVICE_PM_OFF,
-};
-
/*
* shutdown.c
*/
-extern int device_detach_shutdown(struct device *);
extern void device_shutdown(void);