projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
c3cf83b
)
[PATCH] hpet: trivial __iomem annotations
author
Al Viro
<
[email protected]
>
Fri, 9 Feb 2007 16:39:15 +0000
(16:39 +0000)
committer
Linus Torvalds
<
[email protected]
>
Fri, 9 Feb 2007 17:14:07 +0000
(09:14 -0800)
Signed-off-by: Al Viro <
[email protected]
>
Signed-off-by: Linus Torvalds <
[email protected]
>
arch/i386/kernel/hpet.c
patch
|
blob
|
history
diff --git
a/arch/i386/kernel/hpet.c
b/arch/i386/kernel/hpet.c
index 45a8685bb60bb5e21e638cd6c0b6df95586606f2..0b29d41322a2620c50a0bdc98fa1ec314d397ac9 100644
(file)
--- a/
arch/i386/kernel/hpet.c
+++ b/
arch/i386/kernel/hpet.c
@@
-12,7
+12,7
@@
/* FSEC = 10^-15 NSEC = 10^-9 */
#define FSEC_PER_NSEC 1000000
-static void *hpet_ptr;
+static void
__iomem
*hpet_ptr;
static cycle_t read_hpet(void)
{
@@
-40,8
+40,7
@@
static int __init init_hpet_clocksource(void)
return -ENODEV;
/* calculate the hpet address: */
- hpet_base =
- (void __iomem*)ioremap_nocache(hpet_address, HPET_MMAP_SIZE);
+ hpet_base = ioremap_nocache(hpet_address, HPET_MMAP_SIZE);
hpet_ptr = hpet_base + HPET_COUNTER;
/* calculate the frequency: */