diff --git a/[refs] b/[refs] index 1efebf05cbc4..635f7fbc65bc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 84255d1018c50e72c71a49f359989597d53a3f53 +refs/heads/master: 03de250a269bfa8e6a9e6ccb4a1dbce19dae8a61 diff --git a/trunk/include/linux/raid/md.h b/trunk/include/linux/raid/md.h index 81a1a02d4566..b7386ae9d288 100644 --- a/trunk/include/linux/raid/md.h +++ b/trunk/include/linux/raid/md.h @@ -72,6 +72,8 @@ */ #define MD_PATCHLEVEL_VERSION 3 +extern int mdp_major; + extern int register_md_personality (struct mdk_personality *p); extern int unregister_md_personality (struct mdk_personality *p); extern mdk_thread_t * md_register_thread (void (*run) (mddev_t *mddev), diff --git a/trunk/init/do_mounts_md.c b/trunk/init/do_mounts_md.c index 7473b0c59d4d..693d24694a6c 100644 --- a/trunk/init/do_mounts_md.c +++ b/trunk/init/do_mounts_md.c @@ -24,7 +24,6 @@ static struct { static int md_setup_ents __initdata; -extern int mdp_major; /* * Parse the command-line parameters given our kernel, but do not * actually try to invoke the MD device now; that is handled by