summaryrefslogtreecommitdiff
path: root/drivers/sbus/char/display7seg.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-01-11 05:41:39 +0300
committerIngo Molnar <mingo@elte.hu>2009-01-11 05:41:39 +0300
commitabede81c4fb2e3b85d8760f25e3da39d2c69a134 (patch)
tree26c893ec108d837eb9171d678c55a1cea7b22af4 /drivers/sbus/char/display7seg.c
parentc9d557c19f94df42db78d4a5de4d25feee694bad (diff)
parentc59765042f53a79a7a65585042ff463b69cb248c (diff)
downloadlinux-abede81c4fb2e3b85d8760f25e3da39d2c69a134.tar.xz
Merge commit 'v2.6.29-rc1' into core/urgent
Diffstat (limited to 'drivers/sbus/char/display7seg.c')
-rw-r--r--drivers/sbus/char/display7seg.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/sbus/char/display7seg.c b/drivers/sbus/char/display7seg.c
index 2550af4ae432..4431578d8c45 100644
--- a/drivers/sbus/char/display7seg.c
+++ b/drivers/sbus/char/display7seg.c
@@ -214,7 +214,7 @@ static int __devinit d7s_probe(struct of_device *op,
writeb(regs, p->regs);
- printk(KERN_INFO PFX "7-Segment Display%s at [%s:0x%lx] %s\n",
+ printk(KERN_INFO PFX "7-Segment Display%s at [%s:0x%llx] %s\n",
op->node->full_name,
(regs & D7S_FLIP) ? " (FLIPPED)" : "",
op->resource[0].start,