From: Gulsah Kose <gulsah.1004@gmail.com>
Date: Tue, 30 Sep 2014 19:12:23 +0000 (+0300)
Subject: staging: octeon: Combined seperate strings.
X-Git-Tag: v3.18-rc1~130^2~36
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=61e15f010e4a3647043e55e41f60197ba4aa9b4f;p=thirdparty%2Flinux.git

staging: octeon: Combined seperate strings.

This patch fixes "quoted string split across lines" checkpatch.pl
warning in ethernet-rx.c

Signed-off-by: Gulsah Kose <gulsah.1004@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/drivers/staging/octeon/ethernet-rx.c b/drivers/staging/octeon/ethernet-rx.c
index a0f4868cfa13a..b2b6c3cd2bed1 100644
--- a/drivers/staging/octeon/ethernet-rx.c
+++ b/drivers/staging/octeon/ethernet-rx.c
@@ -203,8 +203,7 @@ static inline int cvm_oct_check_rcv_error(cvmx_wqe_t *work)
 					ptr++;
 				}
 			} else {
-				printk_ratelimited("Port %d unknown preamble, packet "
-						   "dropped\n",
+				printk_ratelimited("Port %d unknown preamble, packet dropped\n",
 						   work->ipprt);
 				/*
 				   cvmx_helper_dump_packet(work);