diff options
| author | Steve French <sfrench@us.ibm.com> | 2005-11-13 23:28:58 -0500 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2005-11-13 23:28:58 -0500 |
| commit | 7b0a65f9923ffe7885a5473648baaa3a1a701726 (patch) | |
| tree | b9be4a0504b4e637b86bdc92d88268ff57ea1bc5 /arch/i386/kernel/apm.c | |
| parent | 1b98a8221e3c9c86ae7e292ba7542d2dd6f10eb9 (diff) | |
| parent | ee90f62b3e69d0cd9f8edc6b95f07b1a8c38aaf4 (diff) | |
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'arch/i386/kernel/apm.c')
| -rw-r--r-- | arch/i386/kernel/apm.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/i386/kernel/apm.c b/arch/i386/kernel/apm.c index 003548b8735f..1e60acbed3c1 100644 --- a/arch/i386/kernel/apm.c +++ b/arch/i386/kernel/apm.c | |||
| @@ -218,6 +218,7 @@ | |||
| 218 | #include <linux/time.h> | 218 | #include <linux/time.h> |
| 219 | #include <linux/sched.h> | 219 | #include <linux/sched.h> |
| 220 | #include <linux/pm.h> | 220 | #include <linux/pm.h> |
| 221 | #include <linux/pm_legacy.h> | ||
| 221 | #include <linux/device.h> | 222 | #include <linux/device.h> |
| 222 | #include <linux/kernel.h> | 223 | #include <linux/kernel.h> |
| 223 | #include <linux/smp.h> | 224 | #include <linux/smp.h> |