diff options
| author | James Morris <jmorris@namei.org> | 2009-05-08 03:56:47 -0400 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2009-05-08 03:56:47 -0400 |
| commit | d254117099d711f215e62427f55dfb8ebd5ad011 (patch) | |
| tree | 0848ff8dd74314fec14a86497f8d288c86ba7c65 /init/do_mounts_md.c | |
| parent | 07ff7a0b187f3951788f64ae1f30e8109bc8e9eb (diff) | |
| parent | 8c9ed899b44c19e81859fbb0e9d659fe2f8630fc (diff) | |
Merge branch 'master' into next
Diffstat (limited to 'init/do_mounts_md.c')
| -rw-r--r-- | init/do_mounts_md.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/init/do_mounts_md.c b/init/do_mounts_md.c index 9bdddbcb3d6a..69aebbf8fd2d 100644 --- a/init/do_mounts_md.c +++ b/init/do_mounts_md.c | |||
| @@ -1,5 +1,6 @@ | |||
| 1 | #include <linux/delay.h> | 1 | #include <linux/delay.h> |
| 2 | #include <linux/raid/md.h> | 2 | #include <linux/raid/md_u.h> |
| 3 | #include <linux/raid/md_p.h> | ||
| 3 | 4 | ||
| 4 | #include "do_mounts.h" | 5 | #include "do_mounts.h" |
| 5 | 6 | ||
| @@ -112,8 +113,6 @@ static int __init md_setup(char *str) | |||
| 112 | return 1; | 113 | return 1; |
| 113 | } | 114 | } |
| 114 | 115 | ||
| 115 | #define MdpMinorShift 6 | ||
| 116 | |||
| 117 | static void __init md_setup_drive(void) | 116 | static void __init md_setup_drive(void) |
| 118 | { | 117 | { |
| 119 | int minor, i, ent, partitioned; | 118 | int minor, i, ent, partitioned; |