Merge branch 'for-linus' of git://brick.kernel.dk/data/git/linux-2.6-block

[karo-tx-linux.git] / include / asm-i386 / timex.h

diff --git a/include/asm-i386/timex.h b/include/asm-i386/timex.h
index e370f907bd39031b6c2d3f669ac6f77d26536771..292b5a68f6271b08b410d19197e3434f654e517f 100644 (file)
--- a/include/asm-i386/timex.h
+++ b/include/asm-i386/timex.h
@@ -47,7 +47,7 @@ static inline cycles_t get_cycles (void)
        return ret;
 }
 
-extern unsigned long cpu_khz;
+extern unsigned int cpu_khz;
 
 extern int read_current_timer(unsigned long *timer_value);
 #define ARCH_HAS_READ_CURRENT_TIMER    1