diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2020-10-07 10:01:20 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2020-10-07 10:02:38 +0200 |
| commit | 764941b17e53e40dd1df1ac3137ebc825d5d6480 (patch) | |
| tree | 845a9c567691ddfac0c46493f2f50fe61e1e728e /drivers/power | |
| parent | bc4ac257257c340b108499e65ed7ac383306b2b8 (diff) | |
| parent | 8a7822a8d6659a1132f668dcc20328a1e646f00e (diff) | |
| download | barebox-764941b17e53e40dd1df1ac3137ebc825d5d6480.tar.gz barebox-764941b17e53e40dd1df1ac3137ebc825d5d6480.tar.xz | |
Merge branch 'for-next/magicvar-unique-id' into for-next/reboot-mode
Diffstat (limited to 'drivers/power')
| -rw-r--r-- | drivers/power/reset/reboot-mode.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/drivers/power/reset/reboot-mode.c b/drivers/power/reset/reboot-mode.c index 313ba6dc3a..df3be03edf 100644 --- a/drivers/power/reset/reboot-mode.c +++ b/drivers/power/reset/reboot-mode.c @@ -225,9 +225,7 @@ const char *reboot_mode_get(void) } EXPORT_SYMBOL_GPL(reboot_mode_get); -BAREBOX_MAGICVAR_NAMED(global_system_reboot_mode_prev, - global.system.reboot_mode.prev, - "reboot-mode: Mode set previously, before barebox start"); -BAREBOX_MAGICVAR_NAMED(global_system_reboot_mode_next, - global.system.reboot_mode.next, - "reboot-mode: Mode to set next, to be evaluated after reset"); +BAREBOX_MAGICVAR(global.system.reboot_mode.prev, + "reboot-mode: Mode set previously, before barebox start"); +BAREBOX_MAGICVAR(global.system.reboot_mode.next, + "reboot-mode: Mode to set next, to be evaluated after reset"); |