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/char | |
| 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/char')
| -rw-r--r-- | drivers/char/hw_random/n2-drv.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/hw_random/n2-drv.c b/drivers/char/hw_random/n2-drv.c index 8859aeac2d25..9b3e09cd41f9 100644 --- a/drivers/char/hw_random/n2-drv.c +++ b/drivers/char/hw_random/n2-drv.c | |||
| @@ -482,7 +482,7 @@ static void n2rng_dump_test_buffer(struct n2rng *np) | |||
| 482 | int i; | 482 | int i; |
| 483 | 483 | ||
| 484 | for (i = 0; i < SELFTEST_BUFFER_WORDS; i++) | 484 | for (i = 0; i < SELFTEST_BUFFER_WORDS; i++) |
| 485 | dev_err(&np->op->dev, "Test buffer slot %d [0x%016lx]\n", | 485 | dev_err(&np->op->dev, "Test buffer slot %d [0x%016llx]\n", |
| 486 | i, np->test_buffer[i]); | 486 | i, np->test_buffer[i]); |
| 487 | } | 487 | } |
| 488 | 488 | ||