diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-03 12:45:53 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-03 12:45:53 -0400 |
| commit | c54c4dec61eec88de8260a00260fe89aa538f267 (patch) | |
| tree | b515c760f6eba432f05625b417612550c755efe5 /include/linux | |
| parent | 5de1ccbe51e89c51a2fe5ab333b7c9c2e7294aff (diff) | |
| parent | 0d44dc59b2b434b29aafeae581d06f81efac7c83 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
crypto: ixp4xx - Fix handling of chained sg buffers
crypto: shash - Fix unaligned calculation with short length
hwrng: timeriomem - Use phys address rather than virt
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/timeriomem-rng.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/timeriomem-rng.h b/include/linux/timeriomem-rng.h index dd253177f65f..3e08a1c86830 100644 --- a/include/linux/timeriomem-rng.h +++ b/include/linux/timeriomem-rng.h | |||
| @@ -14,7 +14,7 @@ struct timeriomem_rng_data { | |||
| 14 | struct completion completion; | 14 | struct completion completion; |
| 15 | unsigned int present:1; | 15 | unsigned int present:1; |
| 16 | 16 | ||
| 17 | u32 __iomem *address; | 17 | void __iomem *address; |
| 18 | 18 | ||
| 19 | /* measures in usecs */ | 19 | /* measures in usecs */ |
| 20 | unsigned int period; | 20 | unsigned int period; |