diff options
| author | Tony Luck <tony.luck@intel.com> | 2005-07-13 15:15:43 -0400 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2005-07-13 15:15:43 -0400 |
| commit | 99ad25a313bda566a346b46a6015afa65bc0a02b (patch) | |
| tree | b9443fed1ab74f320c4ee0791864ee96d7c069df /kernel/power/disk.c | |
| parent | f62c4a96f74d6c6dd56d1742697e94a5c2085e87 (diff) | |
| parent | 9a556e89081b0c1c2f83cee915363b15a68a6f2d (diff) | |
Auto merge with /home/aegl/GIT/linus
Diffstat (limited to 'kernel/power/disk.c')
| -rw-r--r-- | kernel/power/disk.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/kernel/power/disk.c b/kernel/power/disk.c index c51a4d96d4eb..3ec789c6b537 100644 --- a/kernel/power/disk.c +++ b/kernel/power/disk.c | |||
| @@ -16,6 +16,8 @@ | |||
| 16 | #include <linux/device.h> | 16 | #include <linux/device.h> |
| 17 | #include <linux/delay.h> | 17 | #include <linux/delay.h> |
| 18 | #include <linux/fs.h> | 18 | #include <linux/fs.h> |
| 19 | #include <linux/mount.h> | ||
| 20 | |||
| 19 | #include "power.h" | 21 | #include "power.h" |
| 20 | 22 | ||
| 21 | 23 | ||