summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHuang Weiyi <weiyi.huang@gmail.com>2008-10-31 12:47:23 +0800
committerLinus Torvalds <torvalds@linux-foundation.org>2008-11-01 10:35:51 -0700
commitd3f15800d5752ca4814270180798ab8323157d28 (patch)
tree5db82711ede9dade338900bade4d1f33568006b7
parent1f98757776eafe31065be9118db6051afcf8643c (diff)
downloadlinux-stable-d3f15800d5752ca4814270180798ab8323157d28.tar.gz
linux-stable-d3f15800d5752ca4814270180798ab8323157d28.tar.bz2
linux-stable-d3f15800d5752ca4814270180798ab8323157d28.zip
init/do_mounts_md.c: remove duplicated #include
Removed duplicated #include <linux/delay.h> in init/do_mounts_md.c. The same compile error ("error: implicit declaration of function 'msleep'") got fixed twice: - f8b77d39397e1510b1a3bcfd385ebd1a45aae77f ("init/do_mounts_md.c: msleep compile fix") - 73b4a24f5ff09389ba6277c53a266b142f655ed2 ("init/do_mounts_md.c must #include <linux/delay.h>") by people adding the <linux/delay.h> include in two slightly different places. Andrew's quilt scripts happily ignore the fuzz, and will re-apply the patch even though they had conflicts. Signed-off-by: Huang Weiyi <weiyi.huang@gmail.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--init/do_mounts_md.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/init/do_mounts_md.c b/init/do_mounts_md.c
index 4d42f450b590..d6da5cdd3c38 100644
--- a/init/do_mounts_md.c
+++ b/init/do_mounts_md.c
@@ -1,6 +1,5 @@
#include <linux/delay.h>
#include <linux/raid/md.h>
-#include <linux/delay.h>
#include "do_mounts.h"