Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

[linux-2.6.git] / drivers / net / can / sja1000 / sja1000_of_platform.c

diff --git a/drivers/net/can/sja1000/sja1000_of_platform.c b/drivers/net/can/sja1000/sja1000_of_platform.c
index aa953fb..9dd076a 100644 (file)
--- a/drivers/net/can/sja1000/sja1000_of_platform.c
+++ b/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;
        }
@@ -211,6 +213,7 @@ static struct of_device_id __devinitdata sja1000_ofp_table[] = {
        {.compatible = "nxp,sja1000"},
        {},
 };
+MODULE_DEVICE_TABLE(of, sja1000_ofp_table);
 
 static struct of_platform_driver sja1000_ofp_driver = {
        .owner = THIS_MODULE,