diff options
| author | Steve French <sfrench@us.ibm.com> | 2008-05-06 13:55:32 -0400 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2008-05-06 13:55:32 -0400 |
| commit | a815752ac0ffdb910e92958d41d28f4fb28e5296 (patch) | |
| tree | a3aa16a282354da0debe8e3a3a7ed8aac6e54001 /include/linux/pm.h | |
| parent | 5ade9deaaa3e1f7291467d97b238648e43eae15e (diff) | |
| parent | a15306365a16380f3bafee9e181ba01231d4acd7 (diff) | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'include/linux/pm.h')
| -rw-r--r-- | include/linux/pm.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/include/linux/pm.h b/include/linux/pm.h index 1de72cbbe0d1..39a7ee859b67 100644 --- a/include/linux/pm.h +++ b/include/linux/pm.h | |||
| @@ -21,8 +21,6 @@ | |||
| 21 | #ifndef _LINUX_PM_H | 21 | #ifndef _LINUX_PM_H |
| 22 | #define _LINUX_PM_H | 22 | #define _LINUX_PM_H |
| 23 | 23 | ||
| 24 | #ifdef __KERNEL__ | ||
| 25 | |||
| 26 | #include <linux/list.h> | 24 | #include <linux/list.h> |
| 27 | #include <asm/atomic.h> | 25 | #include <asm/atomic.h> |
| 28 | #include <asm/errno.h> | 26 | #include <asm/errno.h> |
| @@ -225,6 +223,4 @@ extern unsigned int pm_flags; | |||
| 225 | #define PM_APM 1 | 223 | #define PM_APM 1 |
| 226 | #define PM_ACPI 2 | 224 | #define PM_ACPI 2 |
| 227 | 225 | ||
| 228 | #endif /* __KERNEL__ */ | ||
| 229 | |||
| 230 | #endif /* _LINUX_PM_H */ | 226 | #endif /* _LINUX_PM_H */ |