diff --git a/[refs] b/[refs] index e65755492f3c..30f149671f06 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0a3abcf75bf391fec4e32356ab5ddb8f5d2e6b41 +refs/heads/master: e086fcea861f82f2086a97e401a15e1ba07e8566 diff --git a/trunk/fs/cifs/cifs_debug.c b/trunk/fs/cifs/cifs_debug.c index 892fc70cc951..0228ed06069e 100644 --- a/trunk/fs/cifs/cifs_debug.c +++ b/trunk/fs/cifs/cifs_debug.c @@ -918,11 +918,11 @@ security_flags_write(struct file *file, const char __user *buffer, return count; } #else -static inline void cifs_proc_init(void) +inline void cifs_proc_init(void) { } -static inline void cifs_proc_clean(void) +inline void cifs_proc_clean(void) { } #endif /* PROC_FS */