selinux-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/selinux-2.6:
  make selinux_parse_opts_str() static

security/selinux/hooks.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -800,7 +800,8 @@ static void selinux_sb_clone_mnt_opts(const struct super_block *oldsb,
		mutex_unlock(&newsbsec->lock);
		}

		int selinux_parse_opts_str(char options, struct security_mnt_opts opts)
		static int selinux_parse_opts_str(char *options,
		struct security_mnt_opts *opts)
		{
		char *p;
		char context = NULL, defcontext = NULL;