diff options
author | Petr Mladek <pmladek@suse.com> | 2018-06-05 07:39:12 -0400 |
---|---|---|
committer | Petr Mladek <pmladek@suse.com> | 2018-06-05 07:39:12 -0400 |
commit | 8bafa2a44ff3647904eaa3c9228bfbd36742b9b4 (patch) | |
tree | c0bc2ef9e965e50e57aaa22293084ee308b41d3f /lib | |
parent | bcf8677bc621e0e3b6ed67668d6bd72908fdec2c (diff) | |
parent | 666902e42fd8344b923c02dc5b0f37948ff4f225 (diff) |
Merge branch 'for-4.18-vsprintf-pcr-removal' into for-4.18
Diffstat (limited to 'lib')
-rw-r--r-- | lib/vsprintf.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/lib/vsprintf.c b/lib/vsprintf.c index 7649ef4ed7d0..8999202ad43b 100644 --- a/lib/vsprintf.c +++ b/lib/vsprintf.c | |||
@@ -1459,9 +1459,6 @@ char *clock(char *buf, char *end, struct clk *clk, struct printf_spec spec, | |||
1459 | return string(buf, end, NULL, spec); | 1459 | return string(buf, end, NULL, spec); |
1460 | 1460 | ||
1461 | switch (fmt[1]) { | 1461 | switch (fmt[1]) { |
1462 | case 'r': | ||
1463 | return number(buf, end, clk_get_rate(clk), spec); | ||
1464 | |||
1465 | case 'n': | 1462 | case 'n': |
1466 | default: | 1463 | default: |
1467 | #ifdef CONFIG_COMMON_CLK | 1464 | #ifdef CONFIG_COMMON_CLK |