summaryrefslogtreecommitdiffstats
path: root/arch/arm/plat-mxc
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2008-10-09 22:31:56 +0200
committerRussell King <rmk+kernel@arm.linux.org.uk>2008-10-09 22:31:56 +0200
commit6a4690c22f5da1eb1c898b61b6a80da52fbd976f (patch)
treea03891a32abe0da191fb765fe669a597e07423c6 /arch/arm/plat-mxc
parentMerge branches 'machtypes', 'core', 'ep93xx', 'ks8695', 'netdev' and 'sa1100'... (diff)
parent[ARM] Improve non-executable support (diff)
downloadlinux-6a4690c22f5da1eb1c898b61b6a80da52fbd976f.tar.xz
linux-6a4690c22f5da1eb1c898b61b6a80da52fbd976f.zip
Merge branch 'ptebits' into devel
Conflicts: arch/arm/Kconfig
Diffstat (limited to 'arch/arm/plat-mxc')
-rw-r--r--arch/arm/plat-mxc/clock.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/plat-mxc/clock.c b/arch/arm/plat-mxc/clock.c
index 2f8627218839..0a38f0b396eb 100644
--- a/arch/arm/plat-mxc/clock.c
+++ b/arch/arm/plat-mxc/clock.c
@@ -37,7 +37,6 @@
#include <linux/proc_fs.h>
#include <linux/semaphore.h>
#include <linux/string.h>
-#include <linux/version.h>
#include <mach/clock.h>