

Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 25-akpm/include/linux/security.h |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

diff -puN include/linux/security.h~lsm-rename-security_scaffolding_startup-to-security_init-fix include/linux/security.h
--- 25/include/linux/security.h~lsm-rename-security_scaffolding_startup-to-security_init-fix	2004-10-22 00:04:54.393382032 -0700
+++ 25-akpm/include/linux/security.h	2004-10-22 00:04:59.606589504 -0700
@@ -1909,7 +1909,7 @@ extern int mod_unreg_security	(const cha
  * are just stubbed out, but a few must call the proper capable code.
  */
 
-static inline int security_scaffolding_startup (void)
+static inline int security_init(void)
 {
 	return 0;
 }
_
