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
This commit is contained in:
Linus Torvalds
2009-04-03 09:45:53 -07:00
4 changed files with 102 additions and 124 deletions

View File

@@ -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;