diff options
author | Arnd Bergmann <arnd@arndb.de> | 2012-09-28 19:51:22 (GMT) |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2012-09-28 19:51:38 (GMT) |
commit | df69a4627eb5de58ec71fdf6a7b5d0ce9410d57e (patch) | |
tree | 8f7587ab9a24a3c04afe842c3a7d51cb2c31a1cc /arch/arm/mach-bcmring/include/mach/timex.h | |
parent | e3a66aa33a8f06924f67770e15c22a5c52df314e (diff) | |
parent | 25e4b485fb8eeda8aa7a2e1e45fbb31538565117 (diff) | |
download | linux-fsl-qoriq-df69a4627eb5de58ec71fdf6a7b5d0ce9410d57e.tar.xz |
Merge branch 'bcmring/removal' into next/multiplatform
The removal of bcmring has non-obvious commits with the way the
multiplatform configuration works, so merge it in here.
Conflicts:
arch/arm/Kconfig
arch/arm/Makefile
arch/arm/mach-bcmring/arch.c
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-bcmring/include/mach/timex.h')
-rw-r--r-- | arch/arm/mach-bcmring/include/mach/timex.h | 25 |
1 files changed, 0 insertions, 25 deletions
diff --git a/arch/arm/mach-bcmring/include/mach/timex.h b/arch/arm/mach-bcmring/include/mach/timex.h deleted file mode 100644 index 40d033e..0000000 --- a/arch/arm/mach-bcmring/include/mach/timex.h +++ /dev/null @@ -1,25 +0,0 @@ -/* - * - * Integrator architecture timex specifications - * - * Copyright (C) 1999 ARM Limited - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * 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. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -/* - * Specifies the number of ticks per second - */ -#define CLOCK_TICK_RATE 100000 /* REG_SMT_TICKS_PER_SEC */ |