diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2011-01-17 09:43:40 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2011-01-17 09:43:40 +0100 |
| commit | 2f0109b1bb833fe3481b37a6cfa0ae319d248754 (patch) | |
| tree | a7b1d214a66fcc4f5618fc4e4fec6d23237b6b28 /drivers/net/cs8900.c | |
| parent | 2fed74ef6d446552300cc254de7b3e26140b04fe (diff) | |
| parent | d0e7facd5482c31a5640b31c9a4555e5a4ee215c (diff) | |
| download | barebox-2f0109b1bb833fe3481b37a6cfa0ae319d248754.tar.gz barebox-2f0109b1bb833fe3481b37a6cfa0ae319d248754.tar.xz | |
Merge branch 'master' into next
Diffstat (limited to 'drivers/net/cs8900.c')
| -rw-r--r-- | drivers/net/cs8900.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/cs8900.c b/drivers/net/cs8900.c index 187c0fb425..de6d038674 100644 --- a/drivers/net/cs8900.c +++ b/drivers/net/cs8900.c @@ -364,7 +364,7 @@ static void cs8900_info(struct device_d *dev) struct cs8900_priv *priv = (struct cs8900_priv *)edev->priv; u16 v; - printf("%s Rev. %s (PID: 0x%04x) at 0x%08x\n", priv->chip->name, + printf("%s Rev. %s (PID: 0x%04x) at 0x%p\n", priv->chip->name, priv->product->rev_name, priv->product->product_id, priv->regs); @@ -399,7 +399,7 @@ static int cs8900_check_id(struct cs8900_priv *priv) u16 v; v = cs8900_ior(priv, PP_BI_VID); if (v != CRYSTAL_SEMI_EISA_ID) { - printf("No CS89x0 variant found at 0x%08x vid: 0x%04x\n", + printf("No CS89x0 variant found at 0x%p vid: 0x%04x\n", priv->regs, v); return -1; } @@ -424,7 +424,7 @@ static int cs8900_check_id(struct cs8900_priv *priv) printf("Invalid chip type %d\n", product->chip_type); goto out; } - printf("%s Rev. %s (PID: 0x%04x) found at 0x%08x\n", chip->name, + printf("%s Rev. %s (PID: 0x%04x) found at 0x%p\n", chip->name, product->rev_name, v, priv->regs); priv->chip = chip; priv->product = product; |