projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
[powerpc.git]
/
arch
/
i386
/
kernel
/
hpet.c
diff --git
a/arch/i386/kernel/hpet.c
b/arch/i386/kernel/hpet.c
index
c6737c3
..
17647a5
100644
(file)
--- a/
arch/i386/kernel/hpet.c
+++ b/
arch/i386/kernel/hpet.c
@@
-35,7
+35,7
@@
static int __init init_hpet_clocksource(void)
void __iomem* hpet_base;
u64 tmp;
- if (!
hpet_address
)
+ if (!
is_hpet_enabled()
)
return -ENODEV;
/* calculate the hpet address: */