aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDave Mitchell <dmitchell@appliedmicro.com>2009-11-17 14:56:55 +0000
committerDavid S. Miller <davem@davemloft.net>2009-11-18 05:11:09 -0800
commit4acc5a8eb42c3a5a7df570face5f03fb37fff349 (patch)
treeec0ed7da3b50fc87497eb99eaaa3004492d09953
parent6b863d1d3239eff0f45c2e6e672f5b56db828db0 (diff)
downloadkernel_samsung_crespo-4acc5a8eb42c3a5a7df570face5f03fb37fff349.zip
kernel_samsung_crespo-4acc5a8eb42c3a5a7df570face5f03fb37fff349.tar.gz
kernel_samsung_crespo-4acc5a8eb42c3a5a7df570face5f03fb37fff349.tar.bz2
ibm_newemac: Fix EMACx_TRTR[TRT] bit shifts
The TRT bit shifts were reversed for EMAC4 and non-EMAC4 during the port from ibm_emac to ibm_newemac. This patch corrects that error. Signed-off-by: Dave Mitchell <dmitchell@appliedmicro.com> Acked-by: Feng Kan <fkan@appliedmicro.com> Acked-by: Prodyut Hazarika <phazarika@appliedmicro.com> Acked-by: Stefan Roese <sr@denx.de> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/ibm_newemac/emac.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ibm_newemac/emac.h b/drivers/net/ibm_newemac/emac.h
index d34adf9..8a61b59 100644
--- a/drivers/net/ibm_newemac/emac.h
+++ b/drivers/net/ibm_newemac/emac.h
@@ -263,8 +263,8 @@ struct emac_regs {
/* EMACx_TRTR */
-#define EMAC_TRTR_SHIFT_EMAC4 27
-#define EMAC_TRTR_SHIFT 24
+#define EMAC_TRTR_SHIFT_EMAC4 24
+#define EMAC_TRTR_SHIFT 27
/* EMAC specific TX descriptor control fields (write access) */
#define EMAC_TX_CTRL_GFCS 0x0200