diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2020-10-14 12:46:35 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2020-10-14 12:46:35 +0200 |
| commit | e9299c644a17b7ae6a91d3a4b6ccdd9acba443fe (patch) | |
| tree | fb963cfe5601359221313f6ee3fffb6421eccc7a /fs | |
| parent | 4a1d867da4bba530f7e236f4ff244dc7f6099257 (diff) | |
| parent | 8a7822a8d6659a1132f668dcc20328a1e646f00e (diff) | |
| download | barebox-e9299c644a17b7ae6a91d3a4b6ccdd9acba443fe.tar.gz barebox-e9299c644a17b7ae6a91d3a4b6ccdd9acba443fe.tar.xz | |
Merge branch 'for-next/magicvar-unique-id' into master
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/ubifs/ubifs.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/fs/ubifs/ubifs.c b/fs/ubifs/ubifs.c index fd35619246..eda62497e7 100644 --- a/fs/ubifs/ubifs.c +++ b/fs/ubifs/ubifs.c @@ -517,8 +517,7 @@ static int ubifs_init(void) coredevice_initcall(ubifs_init); -BAREBOX_MAGICVAR_NAMED(global_ubifs_allow_encrypted, global.ubifs.allow_encrypted, - "If true, allow to mount UBIFS with encrypted files"); -BAREBOX_MAGICVAR_NAMED(global_ubifs_allow_authenticated_unauthenticated, - global.ubifs.allow_authenticated_unauthenticated, - "If true, allow to mount authenticated UBIFS images without doing authentication"); +BAREBOX_MAGICVAR(global.ubifs.allow_encrypted, + "If true, allow to mount UBIFS with encrypted files"); +BAREBOX_MAGICVAR(global.ubifs.allow_authenticated_unauthenticated, + "If true, allow to mount authenticated UBIFS images without doing authentication"); |