diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-07 20:23:53 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-07 20:23:53 -0500 |
| commit | 9e42d0cf5020aaf217433cad1a224745241d212a (patch) | |
| tree | 8d64537c600024a4220d1309873ac3467726c3b0 /drivers/sbus/char/display7seg.c | |
| parent | 97c440ba41d4e7cddb8e14c7c7ec49dad2560709 (diff) | |
| parent | 18b8e08e290e9df588f51f5a7df50555f5a25664 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
sparc64: Work around branch tracer warning.
sparc64: Fix unsigned long long warnings in drivers.
sparc64: Use unsigned long long for u64.
sparc: refactor code in fault_32.c
sparc64: refactor code in init_64.c
sparc64: refactor code in viohs.c
sparc: make proces_ver_nack a bit more readable
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, | |||
| 214 | 214 | ||
| 215 | writeb(regs, p->regs); | 215 | writeb(regs, p->regs); |
| 216 | 216 | ||
| 217 | printk(KERN_INFO PFX "7-Segment Display%s at [%s:0x%lx] %s\n", | 217 | printk(KERN_INFO PFX "7-Segment Display%s at [%s:0x%llx] %s\n", |
| 218 | op->node->full_name, | 218 | op->node->full_name, |
| 219 | (regs & D7S_FLIP) ? " (FLIPPED)" : "", | 219 | (regs & D7S_FLIP) ? " (FLIPPED)" : "", |
| 220 | op->resource[0].start, | 220 | op->resource[0].start, |