diff options
author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-01-08 16:24:38 +1100 |
---|---|---|
committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-01-08 16:24:38 +1100 |
commit | 24f030175d30f019be41766cdf88c2ff03de19ff (patch) | |
tree | 354232a84e82d5a721ed7b1a9af580ff2a59be8f /drivers/sbus/char/display7seg.c | |
parent | 4aa12f7b927c3cac0e0cf3503642597527d0ece0 (diff) | |
parent | 9e42d0cf5020aaf217433cad1a224745241d212a (diff) |
Merge commit 'origin/master' into next
Diffstat (limited to 'drivers/sbus/char/display7seg.c')
-rw-r--r-- | drivers/sbus/char/display7seg.c | 2 |
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, |