From 0d5776255ccc2c549b90d7d417408ec163a1ef9b Mon Sep 17 00:00:00 2001 From: Sriram Date: Thu, 29 Jul 2010 02:34:00 +0000 Subject: [PATCH] --- yaml --- r: 203953 b: refs/heads/master c: e994762f7afef242738b220b48c00a6fd2b165a1 h: refs/heads/master i: 203951: 8296ebf6862e60fda3f1f0d30d4dc40e026ec1df v: v3 --- [refs] | 2 +- trunk/drivers/net/davinci_emac.c | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 07d39aa3940e..1ce5d3a8692d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3725b1fe0b9c7e5ba3c4f6e585cd93a7174c1e07 +refs/heads/master: e994762f7afef242738b220b48c00a6fd2b165a1 diff --git a/trunk/drivers/net/davinci_emac.c b/trunk/drivers/net/davinci_emac.c index 2ebf1a1dd1e1..2fe709f98cc4 100644 --- a/trunk/drivers/net/davinci_emac.c +++ b/trunk/drivers/net/davinci_emac.c @@ -564,9 +564,11 @@ static void emac_dump_regs(struct emac_priv *priv) /* Print important registers in EMAC */ dev_info(emac_dev, "EMAC Basic registers\n"); - dev_info(emac_dev, "EMAC: EWCTL: %08X, EWINTTCNT: %08X\n", - emac_ctrl_read(EMAC_CTRL_EWCTL), - emac_ctrl_read(EMAC_CTRL_EWINTTCNT)); + if (priv->version == EMAC_VERSION_1) { + dev_info(emac_dev, "EMAC: EWCTL: %08X, EWINTTCNT: %08X\n", + emac_ctrl_read(EMAC_CTRL_EWCTL), + emac_ctrl_read(EMAC_CTRL_EWINTTCNT)); + } dev_info(emac_dev, "EMAC: TXID: %08X %s, RXID: %08X %s\n", emac_read(EMAC_TXIDVER), ((emac_read(EMAC_TXCONTROL)) ? "enabled" : "disabled"),