git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
mach-iop33x
/
include
/
mach
/
timex.h
diff --git
a/arch/arm/mach-iop33x/include/mach/timex.h
b/arch/arm/mach-iop33x/include/mach/timex.h
index c75760844d49eae5b509d6d9170918d79e3571fe..54c589091d6eb7b6dea1881059602de7258e43bd 100644
(file)
--- a/
arch/arm/mach-iop33x/include/mach/timex.h
+++ b/
arch/arm/mach-iop33x/include/mach/timex.h
@@
-3,7
+3,4
@@
*
* IOP3xx architecture timex specifications
*/
-
-#include <mach/hardware.h>
-
#define CLOCK_TICK_RATE (100 * HZ)