diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-10 20:42:53 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-10 20:42:53 -0500 |
| commit | 506c10f26c481b7f8ef27c1c79290f68989b2e9e (patch) | |
| tree | 03de82e812f00957aa6276dac2fe51c3358e88d7 /drivers/char/hw_random/n2-drv.c | |
| parent | e1df957670aef74ffd9a4ad93e6d2c90bf6b4845 (diff) | |
| parent | c59765042f53a79a7a65585042ff463b69cb248c (diff) | |
Merge commit 'v2.6.29-rc1' into perfcounters/core
Conflicts:
include/linux/kernel_stat.h
Diffstat (limited to 'drivers/char/hw_random/n2-drv.c')
| -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 | ||