diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-08-01 15:39:27 +1000 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-08-01 15:39:27 +1000 |
commit | 7af466006b24639b917768254b30a8250fcfdb17 (patch) | |
tree | 5f911d7371f439fe4f33c0b8d073aa33144f4e3e /init | |
parent | 665756d23f440e4ee69bbdbcd3d94d9137cd99f4 (diff) | |
parent | e284f3493206d4268267db4557c7ee6f89ed2314 (diff) |
Merge remote-tracking branch 'bcon/master'
Conflicts:
drivers/block/Kconfig
Diffstat (limited to 'init')
-rw-r--r-- | init/do_mounts.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/init/do_mounts.c b/init/do_mounts.c index 816014c4627e..c84fedb12c24 100644 --- a/init/do_mounts.c +++ b/init/do_mounts.c @@ -202,7 +202,7 @@ done: * bangs. */ -dev_t name_to_dev_t(char *name) +dev_t name_to_dev_t(const char *name) { char s[32]; char *p; |