Merge 3.4-rc5 into staging-next

[deliverable/linux.git] / drivers / staging / octeon / ethernet-rx.c

diff --git a/drivers/staging/octeon/ethernet-rx.c b/drivers/staging/octeon/ethernet-rx.c
index d91751f9ffe860372d070be165b49d128d9dce45..34afc16bc4935e35f5e47c12d27925f6fe7c62f3 100644 (file)
--- a/drivers/staging/octeon/ethernet-rx.c
+++ b/drivers/staging/octeon/ethernet-rx.c
@@ -163,7 +163,7 @@ static inline int cvm_oct_check_rcv_error(cvmx_wqe_t *work)
                /*
                 * We received a packet with either an alignment error
                 * or a FCS error. This may be signalling that we are
-                * running 10Mbps with GMXX_RXX_FRM_CTL[PRE_CHK}
+                * running 10Mbps with GMXX_RXX_FRM_CTL[PRE_CHK]
                 * off. If this is the case we need to parse the
                 * packet to determine if we can remove a non spec
                 * preamble and generate a correct packet.