summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-04-03 20:45:53 +0400
committerLinus Torvalds <torvalds@linux-foundation.org>2009-04-03 20:45:53 +0400
commitc54c4dec61eec88de8260a00260fe89aa538f267 (patch)
treeb515c760f6eba432f05625b417612550c755efe5 /include
parent5de1ccbe51e89c51a2fe5ab333b7c9c2e7294aff (diff)
parent0d44dc59b2b434b29aafeae581d06f81efac7c83 (diff)
downloadlinux-c54c4dec61eec88de8260a00260fe89aa538f267.tar.xz
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')
-rw-r--r--include/linux/timeriomem-rng.h2
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 {
struct completion completion;
unsigned int present:1;
- u32 __iomem *address;
+ void __iomem *address;
/* measures in usecs */
unsigned int period;