projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'linus' into x86/header-guards
[firefly-linux-kernel-4.4.55.git]
/
include
/
asm-arm
/
arch-pxa
/
timex.h
diff --git
a/include/asm-arm/arch-pxa/timex.h
b/include/asm-arm/arch-pxa/timex.h
index aa125ec56a32fcb62ce83a65727e24bd4a911083..8d882f0b6a163f9c580563c098cc29f1eac767a7 100644
(file)
--- a/
include/asm-arm/arch-pxa/timex.h
+++ b/
include/asm-arm/arch-pxa/timex.h
@@
-10,7
+10,6
@@
* published by the Free Software Foundation.
*/
-#include <linux/config.h>
#if defined(CONFIG_PXA25x)
/* PXA250/210 timer base */
@@
-22,4
+21,6
@@
#else
#define CLOCK_TICK_RATE 3250000
#endif
+#else
+#define CLOCK_TICK_RATE 3250000
#endif