From 6642a1691ebc8fe540f058be7e8ac9caf59f37d6 Mon Sep 17 00:00:00 2001 From: Wolfgang Grandegger Date: Wed, 10 Jun 2009 01:12:39 -0700 Subject: [PATCH] --- yaml --- r: 150797 b: refs/heads/master c: 51611a120e8120290152edd7d0020d22a7f4b4a3 h: refs/heads/master i: 150795: ef90fee1ae6d7cecd6be9318d6a875aa23b6ca4d v: v3 --- [refs] | 2 +- trunk/drivers/net/can/sja1000/sja1000_of_platform.c | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index a10fc2232338..4ef8a0e235cc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bf12691d846b48fa6e3289810a822687457036cf +refs/heads/master: 51611a120e8120290152edd7d0020d22a7f4b4a3 diff --git a/trunk/drivers/net/can/sja1000/sja1000_of_platform.c b/trunk/drivers/net/can/sja1000/sja1000_of_platform.c index aa953fb4b8d0..3373560405ba 100644 --- a/trunk/drivers/net/can/sja1000/sja1000_of_platform.c +++ b/trunk/drivers/net/can/sja1000/sja1000_of_platform.c @@ -108,15 +108,17 @@ static int __devinit sja1000_ofp_probe(struct of_device *ofdev, res_size = resource_size(&res); if (!request_mem_region(res.start, res_size, DRV_NAME)) { - dev_err(&ofdev->dev, "couldn't request %#x..%#x\n", - res.start, res.end); + dev_err(&ofdev->dev, "couldn't request %#llx..%#llx\n", + (unsigned long long)res.start, + (unsigned long long)res.end); return -EBUSY; } base = ioremap_nocache(res.start, res_size); if (!base) { - dev_err(&ofdev->dev, "couldn't ioremap %#x..%#x\n", - res.start, res.end); + dev_err(&ofdev->dev, "couldn't ioremap %#llx..%#llx\n", + (unsigned long long)res.start, + (unsigned long long)res.end); err = -ENOMEM; goto exit_release_mem; }