Merge tag 'omap-for-v3.7-rc1/fixes-cpufreq-signed' of git://git.kernel.org/pub/scm...

[~andy/linux] / security / capability.c

diff --git a/security/capability.c b/security/capability.c
index 61095df8b89ac452d50528144a67dca751d4f992..a40aac677c722b15dd30b89cc57c518d8764b020 100644 (file)
--- a/security/capability.c
+++ b/security/capability.c
@@ -284,7 +284,7 @@ static int cap_path_chmod(struct path *path, umode_t mode)
        return 0;
 }
 
-static int cap_path_chown(struct path *path, uid_t uid, gid_t gid)
+static int cap_path_chown(struct path *path, kuid_t uid, kgid_t gid)
 {
        return 0;
 }