Merge commit 'origin/master'

[oweals/u-boot.git] / drivers / enc28j60.c

diff --git a/drivers/enc28j60.c b/drivers/enc28j60.c
old mode 100755 (executable)
new mode 100644 (file)
index 36b084c..98303ac
--- a/drivers/enc28j60.c
+++ b/drivers/enc28j60.c
@@ -548,8 +548,8 @@ static void encRx (void)
                m_nic_bfs (CTL_REG_ECON2, ENC_ECON2_PKTDEC);
 
                /* taken from the Linux driver */
-               /* Only odd values should be written to ERXRDPTL, 
-                * see errata B4 pt.13 
+               /* Only odd values should be written to ERXRDPTL,
+                * see errata B4 pt.13
                 */
                rxbuf_rdpt = (next_pointer_msb << 8 | next_pointer_lsb) - 1;
                if ((rxbuf_rdpt < (m_nic_read(CTL_REG_ERXSTH) << 8 |