diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-07-17 21:43:26 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-07-17 21:43:26 +0200 |
| commit | 3a6cb8ce07d994f6e4a3679c5478d0f18b6b86c4 (patch) | |
| tree | 7d729e347d8860c9ef5631cb8cdfa96e892f86d5 /arch/arm/mach-zynq/include/mach/timex.h | |
| parent | a990cbd887585a1056b927b3b20de325f14fdf96 (diff) | |
| parent | 3d64b4496f5fd90618106555344205a522178c0c (diff) | |
Merge branch 'zynq/master' of git+ssh://master.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc into next/soc
Conflicts:
arch/arm/Kconfig
arch/arm/mm/Kconfig
Diffstat (limited to 'arch/arm/mach-zynq/include/mach/timex.h')
| -rw-r--r-- | arch/arm/mach-zynq/include/mach/timex.h | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/arch/arm/mach-zynq/include/mach/timex.h b/arch/arm/mach-zynq/include/mach/timex.h new file mode 100644 index 00000000000..6c0245e42a5 --- /dev/null +++ b/arch/arm/mach-zynq/include/mach/timex.h @@ -0,0 +1,23 @@ +/* arch/arm/mach-zynq/include/mach/timex.h + * + * Copyright (C) 2011 Xilinx + * + * 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 __MACH_TIMEX_H__ +#define __MACH_TIMEX_H__ + +/* the following is needed for the system to build but will be removed + in the future, the value is not important but won't hurt +*/ +#define CLOCK_TICK_RATE (100 * HZ) + +#endif |