Messages in this thread Patch in this message | | | From | Nicholas Krause <> | Subject | [PATCH 6/6 v2] alpha: Join lines and merge strings for the two lines | Date | Tue, 15 Jul 2014 23:00:18 -0400 |
| |
This patch merges lines 92 and 93. In addition it merges the strings on both lines by removing the quotes around the seperate strings. This is needed to remove the final checkpatch error I get from running it on bootpz.c
Signed-off-by: Nicholas Krause <xerofoify@gmail.com> --- arch/alpha/boot/bootpz.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/arch/alpha/boot/bootpz.c b/arch/alpha/boot/bootpz.c index d6ad191..51122f7 100644 --- a/arch/alpha/boot/bootpz.c +++ b/arch/alpha/boot/bootpz.c @@ -89,8 +89,7 @@ check_range(unsigned long vstart, unsigned long vend, if (kaddr >= kstart && kaddr <= kend) { #ifdef DEBUG_CHECK_RANGE - srm_printk("OVERLAP: vaddr 0x%lx kaddr 0x%lx" - " [0x%lx:0x%lx]\n", + srm_printk("OVERLAP: vaddr 0x%lx kaddr 0x%lx [0x%lx:0x%lx]\n", vaddr, kaddr, kstart, kend); #endif return 1; -- 1.9.1
| |