diff options
| author | Al Viro <viro@ftp.linux.org.uk> | 2007-02-09 11:39:15 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-09 12:14:07 -0500 |
| commit | 5b71bddb78df5e292ae90f7603a996e51b3ecb88 (patch) | |
| tree | cb8960f384201170df7980ebde2fc1423b9d54ad /arch | |
| parent | c3cf83b70c25c2b1d5569d6cc24e879464d1803b (diff) | |
[PATCH] hpet: trivial __iomem annotations
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/i386/kernel/hpet.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/i386/kernel/hpet.c b/arch/i386/kernel/hpet.c index 45a8685bb60b..0b29d41322a2 100644 --- a/arch/i386/kernel/hpet.c +++ b/arch/i386/kernel/hpet.c | |||
| @@ -12,7 +12,7 @@ | |||
| 12 | /* FSEC = 10^-15 NSEC = 10^-9 */ | 12 | /* FSEC = 10^-15 NSEC = 10^-9 */ |
| 13 | #define FSEC_PER_NSEC 1000000 | 13 | #define FSEC_PER_NSEC 1000000 |
| 14 | 14 | ||
| 15 | static void *hpet_ptr; | 15 | static void __iomem *hpet_ptr; |
| 16 | 16 | ||
| 17 | static cycle_t read_hpet(void) | 17 | static cycle_t read_hpet(void) |
| 18 | { | 18 | { |
| @@ -40,8 +40,7 @@ static int __init init_hpet_clocksource(void) | |||
| 40 | return -ENODEV; | 40 | return -ENODEV; |
| 41 | 41 | ||
| 42 | /* calculate the hpet address: */ | 42 | /* calculate the hpet address: */ |
| 43 | hpet_base = | 43 | hpet_base = ioremap_nocache(hpet_address, HPET_MMAP_SIZE); |
| 44 | (void __iomem*)ioremap_nocache(hpet_address, HPET_MMAP_SIZE); | ||
| 45 | hpet_ptr = hpet_base + HPET_COUNTER; | 44 | hpet_ptr = hpet_base + HPET_COUNTER; |
| 46 | 45 | ||
| 47 | /* calculate the frequency: */ | 46 | /* calculate the frequency: */ |