diff --git a/[refs] b/[refs] index ff80e049b673..e10a5c253894 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c6684b26854000d406c9fa0698443c50f2bf2cba +refs/heads/master: a85cfdaec935ede36be6c54f98878624b0d9fbad diff --git a/trunk/include/linux/miscdevice.h b/trunk/include/linux/miscdevice.h index c41d7270c6c6..32085249e9cb 100644 --- a/trunk/include/linux/miscdevice.h +++ b/trunk/include/linux/miscdevice.h @@ -54,7 +54,7 @@ struct miscdevice { struct device *parent; struct device *this_device; const char *nodename; - mode_t mode; + umode_t mode; }; extern int misc_register(struct miscdevice * misc);