diff options
author | Tony Lindgren <tony@atomide.com> | 2017-08-10 18:05:53 +0200 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2017-08-10 18:05:53 +0200 |
commit | c002c27874faaa170b535d03d7efee89ecdd9be4 (patch) | |
tree | 70d91eba77a9c374e4f0bf9eb8636acba57ca173 /arch/x86/boot/compressed/cmdline.c | |
parent | ARM: dts: dra7: Add "max-frequency" property to MMC dt nodes (diff) | |
parent | Linux v4.13-rc1 (diff) | |
download | linux-c002c27874faaa170b535d03d7efee89ecdd9be4.tar.xz linux-c002c27874faaa170b535d03d7efee89ecdd9be4.zip |
Merge tag 'v4.13-rc1' into omap-for-v4.14/mmc-regulator
Linux v4.13-rc1
Diffstat (limited to 'arch/x86/boot/compressed/cmdline.c')
-rw-r--r-- | arch/x86/boot/compressed/cmdline.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/boot/compressed/cmdline.c b/arch/x86/boot/compressed/cmdline.c index 73ccf63b0f48..9dc1ce6ba3c0 100644 --- a/arch/x86/boot/compressed/cmdline.c +++ b/arch/x86/boot/compressed/cmdline.c @@ -13,7 +13,7 @@ static inline char rdfs8(addr_t addr) return *((char *)(fs + addr)); } #include "../cmdline.c" -static unsigned long get_cmd_line_ptr(void) +unsigned long get_cmd_line_ptr(void) { unsigned long cmd_line_ptr = boot_params->hdr.cmd_line_ptr; |