diff options
| author | James Morris <jmorris@namei.org> | 2009-05-08 03:56:47 -0400 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2009-05-08 03:56:47 -0400 |
| commit | d254117099d711f215e62427f55dfb8ebd5ad011 (patch) | |
| tree | 0848ff8dd74314fec14a86497f8d288c86ba7c65 /include/linux/timeriomem-rng.h | |
| parent | 07ff7a0b187f3951788f64ae1f30e8109bc8e9eb (diff) | |
| parent | 8c9ed899b44c19e81859fbb0e9d659fe2f8630fc (diff) | |
Merge branch 'master' into next
Diffstat (limited to 'include/linux/timeriomem-rng.h')
| -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; |