diff --git a/[refs] b/[refs] index 99469ea64b84..f91386b7545b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b9d8b45ee3c5f62cdbd34ee006f3dd2ac51f7018 +refs/heads/master: 27eabc7cb4b357c68e4ce77d0b014f7a23add752 diff --git a/trunk/include/linux/sysfs.h b/trunk/include/linux/sysfs.h index 47f1c95b5298..6903e9204032 100644 --- a/trunk/include/linux/sysfs.h +++ b/trunk/include/linux/sysfs.h @@ -328,7 +328,7 @@ static inline void sysfs_put(struct sysfs_dirent *sd) { } -static inline void sysfs_exit_ns(enum kobj_ns_type type, const void *tag) +static inline void sysfs_exit_ns(int type, const void *tag) { }