diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2014-03-17 10:14:10 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2014-03-17 10:14:20 +0100 |
| commit | 8d445234dcd5bdb05f21ced4d9928db0b60643dc (patch) | |
| tree | 10f97ba7be19309a8d7814b61651cdd40f637164 /arch/arm/mach-omap2 | |
| parent | Merge tag 'renesas-dt4-for-v3.15' of git://git.kernel.org/pub/scm/linux/kerne... (diff) | |
| parent | ARM: efm32: drop unused file <mach/timex.h> (diff) | |
| download | linux-8d445234dcd5bdb05f21ced4d9928db0b60643dc.tar.xz linux-8d445234dcd5bdb05f21ced4d9928db0b60643dc.zip | |
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.h | 5 |
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> |