diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-12-23 16:23:23 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-12-23 16:23:23 +0100 |
| commit | 1ccedb7cdba6886939dd8b4c8f965a826f696e56 (patch) | |
| tree | 0f5fc519a68faca5318c296315c9b6c502907056 /drivers/video/xilinxfb.c | |
| parent | x86: apic reset counter on shutdown (diff) | |
| parent | Linux 2.6.28-rc9 (diff) | |
| download | linux-1ccedb7cdba6886939dd8b4c8f965a826f696e56.tar.xz linux-1ccedb7cdba6886939dd8b4c8f965a826f696e56.zip | |
Merge commit 'v2.6.28-rc9' into x86/apic
Diffstat (limited to 'drivers/video/xilinxfb.c')
| -rw-r--r-- | drivers/video/xilinxfb.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/video/xilinxfb.c b/drivers/video/xilinxfb.c index 5da3d2423cc0..40a3a2afbfe7 100644 --- a/drivers/video/xilinxfb.c +++ b/drivers/video/xilinxfb.c @@ -298,8 +298,9 @@ static int xilinxfb_assign(struct device *dev, unsigned long physaddr, /* Put a banner in the log (for DEBUG) */ dev_dbg(dev, "regs: phys=%lx, virt=%p\n", physaddr, drvdata->regs); - dev_dbg(dev, "fb: phys=%p, virt=%p, size=%x\n", - (void*)drvdata->fb_phys, drvdata->fb_virt, fbsize); + dev_dbg(dev, "fb: phys=%llx, virt=%p, size=%x\n", + (unsigned long long) drvdata->fb_phys, drvdata->fb_virt, + fbsize); return 0; /* success */ |