summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap2
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2014-03-17 10:14:10 +0100
committerArnd Bergmann <arnd@arndb.de>2014-03-17 10:14:20 +0100
commit8d445234dcd5bdb05f21ced4d9928db0b60643dc (patch)
tree10f97ba7be19309a8d7814b61651cdd40f637164 /arch/arm/mach-omap2
parentc5d326c22b0e2e4f116ff62b7f857617776d571c (diff)
parentd5d5ce952a66c32abf36a6fdf2a1ba6cb8da9b93 (diff)
downloadlinux-8d445234dcd5bdb05f21ced4d9928db0b60643dc.tar.bz2
Merge branch 'efm32/cleanup' into next/dt
Dependency for efm32/dt branch. Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-omap2')
-rw-r--r--arch/arm/mach-omap2/include/mach/timex.h5
1 files changed, 0 insertions, 5 deletions
diff --git a/arch/arm/mach-omap2/include/mach/timex.h b/arch/arm/mach-omap2/include/mach/timex.h
deleted file mode 100644
index de9f8fc40e7c..000000000000
--- a/arch/arm/mach-omap2/include/mach/timex.h
+++ /dev/null
@@ -1,5 +0,0 @@
-/*
- * arch/arm/mach-omap2/include/mach/timex.h
- */
-
-#include <plat/timex.h>