diff options
| author | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
|---|---|---|
| committer | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
| commit | ada47b5fe13d89735805b566185f4885f5a3f750 (patch) | |
| tree | 644b88f8a71896307d71438e9b3af49126ffb22b /init/do_mounts_rd.c | |
| parent | 43e98717ad40a4ae64545b5ba047c7b86aa44f4f (diff) | |
| parent | 3280f21d43ee541f97f8cda5792150d2dbec20d5 (diff) | |
Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master
Diffstat (limited to 'init/do_mounts_rd.c')
| -rw-r--r-- | init/do_mounts_rd.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/init/do_mounts_rd.c b/init/do_mounts_rd.c index 027a402708de..bf3ef667bf36 100644 --- a/init/do_mounts_rd.c +++ b/init/do_mounts_rd.c | |||
| @@ -7,6 +7,7 @@ | |||
| 7 | #include <linux/cramfs_fs.h> | 7 | #include <linux/cramfs_fs.h> |
| 8 | #include <linux/initrd.h> | 8 | #include <linux/initrd.h> |
| 9 | #include <linux/string.h> | 9 | #include <linux/string.h> |
| 10 | #include <linux/slab.h> | ||
| 10 | 11 | ||
| 11 | #include "do_mounts.h" | 12 | #include "do_mounts.h" |
| 12 | #include "../fs/squashfs/squashfs_fs.h" | 13 | #include "../fs/squashfs/squashfs_fs.h" |