summaryrefslogtreecommitdiff
path: root/drivers/char
diff options
context:
space:
mode:
authorPaul Mackerras <paulus@samba.org>2008-11-24 00:53:44 (GMT)
committerPaul Mackerras <paulus@samba.org>2008-11-24 00:53:44 (GMT)
commit11bac8a026dd38380b52a914ec9bf65fb2ad13e2 (patch)
tree16ad0b9cb3e74383062ed664733494633bbd43a7 /drivers/char
parente871809cccc11aaa072afaf746f8fd946d2d9cac (diff)
parentc8d698849e135780738c2cb08f07f06eda982a8c (diff)
downloadlinux-fsl-qoriq-11bac8a026dd38380b52a914ec9bf65fb2ad13e2.tar.xz
Merge branch 'merge' of git://git.secretlab.ca/git/linux-2.6-mpc52xx into merge
Diffstat (limited to 'drivers/char')
-rw-r--r--drivers/char/xilinx_hwicap/xilinx_hwicap.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/char/xilinx_hwicap/xilinx_hwicap.c b/drivers/char/xilinx_hwicap/xilinx_hwicap.c
index ed132fe..d161319 100644
--- a/drivers/char/xilinx_hwicap/xilinx_hwicap.c
+++ b/drivers/char/xilinx_hwicap/xilinx_hwicap.c
@@ -626,7 +626,7 @@ static int __devinit hwicap_setup(struct device *dev, int id,
if (!request_mem_region(drvdata->mem_start,
drvdata->mem_size, DRIVER_NAME)) {
dev_err(dev, "Couldn't lock memory region at %Lx\n",
- regs_res->start);
+ (unsigned long long) regs_res->start);
retval = -EBUSY;
goto failed1;
}
@@ -645,9 +645,10 @@ static int __devinit hwicap_setup(struct device *dev, int id,
mutex_init(&drvdata->sem);
drvdata->is_open = 0;
- dev_info(dev, "ioremap %lx to %p with size %Lx\n",
- (unsigned long int)drvdata->mem_start,
- drvdata->base_address, drvdata->mem_size);
+ dev_info(dev, "ioremap %llx to %p with size %llx\n",
+ (unsigned long long) drvdata->mem_start,
+ drvdata->base_address,
+ (unsigned long long) drvdata->mem_size);
cdev_init(&drvdata->cdev, &hwicap_fops);
drvdata->cdev.owner = THIS_MODULE;