diff options
| author | Paul Mackerras <paulus@samba.org> | 2008-05-02 14:45:50 +1000 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-05-02 14:45:50 +1000 |
| commit | 5be661a28b12aa43cc83ba935ba2b2c273d0da45 (patch) | |
| tree | ae4e699023aad89f698c477ed9a5b4f9830dc8f1 /drivers | |
| parent | fbe543b412cef02350fab35526a6d4dc3d20d182 (diff) | |
| parent | b17b8181c97e88e6fac5aa704879ad61fdd67351 (diff) | |
| download | linux-5be661a28b12aa43cc83ba935ba2b2c273d0da45.tar.gz linux-5be661a28b12aa43cc83ba935ba2b2c273d0da45.tar.bz2 linux-5be661a28b12aa43cc83ba935ba2b2c273d0da45.zip | |
Merge branch 'powerpc-next' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/char/xilinx_hwicap/xilinx_hwicap.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/char/xilinx_hwicap/xilinx_hwicap.c b/drivers/char/xilinx_hwicap/xilinx_hwicap.c index dfe6907ae15b..3edf1fc12963 100644 --- a/drivers/char/xilinx_hwicap/xilinx_hwicap.c +++ b/drivers/char/xilinx_hwicap/xilinx_hwicap.c @@ -623,8 +623,8 @@ 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 %p\n", - (void *)regs_res->start); + dev_err(dev, "Couldn't lock memory region at %Lx\n", + regs_res->start); retval = -EBUSY; goto failed1; } @@ -643,7 +643,7 @@ 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 %x\n", + dev_info(dev, "ioremap %lx to %p with size %Lx\n", (unsigned long int)drvdata->mem_start, drvdata->base_address, drvdata->mem_size); |