diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-01-17 19:48:18 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-01-17 19:48:18 -0800 |
| commit | ed408f7c0fab7ecc72f94f204f0d2607b2749f69 (patch) | |
| tree | 8c85eb47814fff6c9ea0aa6177e47555c0f9c5b1 /fs/debugfs/inode.c | |
| parent | 52f7a82b59ff385da86a3ed17c8d9f6a83531004 (diff) | |
| parent | 7d1f9aeff1ee4a20b1aeb377dd0f579fe9647619 (diff) | |
| download | talos-obmc-linux-ed408f7c0fab7ecc72f94f204f0d2607b2749f69.tar.gz talos-obmc-linux-ed408f7c0fab7ecc72f94f204f0d2607b2749f69.zip | |
Merge 3.9-rc4 into driver-core-next
This is to fix up a build problem with a wireless driver due to the
dynamic-debug patches in this branch.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'fs/debugfs/inode.c')
| -rw-r--r-- | fs/debugfs/inode.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/debugfs/inode.c b/fs/debugfs/inode.c index d329f9c55753..0c4f80b447fb 100644 --- a/fs/debugfs/inode.c +++ b/fs/debugfs/inode.c @@ -176,7 +176,7 @@ static int debugfs_parse_options(char *data, struct debugfs_mount_opts *opts) opts->uid = uid; break; case Opt_gid: - if (match_octal(&args[0], &option)) + if (match_int(&args[0], &option)) return -EINVAL; gid = make_kgid(current_user_ns(), option); if (!gid_valid(gid)) |
