Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

[linux-2.6-block.git] / include / linux / timeriomem-rng.h

diff --git a/include/linux/timeriomem-rng.h b/include/linux/timeriomem-rng.h
index dd253177f65fe3f53ccc737b4af7bb9dab8e9364..3e08a1c86830cafe031e0eea27e2eb0ee07ba4b7 100644 (file)
--- 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;