git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
[pandora-kernel.git]
/
arch
/
arm
/
mach-at91
/
include
/
mach
/
timex.h
diff --git
a/arch/arm/mach-at91/include/mach/timex.h
b/arch/arm/mach-at91/include/mach/timex.h
index
05a6e8a
..
31ac2d9
100644
(file)
--- a/
arch/arm/mach-at91/include/mach/timex.h
+++ b/
arch/arm/mach-at91/include/mach/timex.h
@@
-82,11
+82,6
@@
#define AT91X40_MASTER_CLOCK 40000000
#define CLOCK_TICK_RATE (AT91X40_MASTER_CLOCK)
-#elif defined(CONFIG_ARCH_AT572D940HF)
-
-#define AT572D940HF_MASTER_CLOCK 80000000
-#define CLOCK_TICK_RATE (AT572D940HF_MASTER_CLOCK/16)
-
#endif
#endif