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-msm | |
parent | c5d326c22b0e2e4f116ff62b7f857617776d571c (diff) | |
parent | d5d5ce952a66c32abf36a6fdf2a1ba6cb8da9b93 (diff) |
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-msm')
-rw-r--r-- | arch/arm/mach-msm/include/mach/timex.h | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/arch/arm/mach-msm/include/mach/timex.h b/arch/arm/mach-msm/include/mach/timex.h deleted file mode 100644 index a62e6b215aec..000000000000 --- a/arch/arm/mach-msm/include/mach/timex.h +++ /dev/null @@ -1,21 +0,0 @@ -/* arch/arm/mach-msm/include/mach/timex.h - * - * Copyright (C) 2007 Google, Inc. - * - * This software is licensed under the terms of the GNU General Public - * License version 2, as published by the Free Software Foundation, and - * may be copied, distributed, and modified under those terms. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - */ - -#ifndef __ASM_ARCH_MSM_TIMEX_H -#define __ASM_ARCH_MSM_TIMEX_H - -#define CLOCK_TICK_RATE 1000000 - -#endif |