diff options
| author | Will Deacon <will.deacon@arm.com> | 2013-02-01 10:28:36 +0000 |
|---|---|---|
| committer | Will Deacon <will.deacon@arm.com> | 2013-02-01 10:28:36 +0000 |
| commit | 9e02e394c7d7fdc2570a73fb7fc6da3c79f6db2a (patch) | |
| tree | 225262f25e7b6518b47fbf68b1311cee61e3ad83 /include/clocksource/arm_generic.h | |
| parent | 5b91ab0abc957145c3ff6be03eb9a3901797019f (diff) | |
| parent | 8266891e252f35dcb189c3f2371cfa588f8a8818 (diff) | |
Merge branch 'for-will/arch-timer-unification' of git://linux-arm.org/linux-mr into for-arm-soc/arch-timers
Diffstat (limited to 'include/clocksource/arm_generic.h')
| -rw-r--r-- | include/clocksource/arm_generic.h | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/include/clocksource/arm_generic.h b/include/clocksource/arm_generic.h deleted file mode 100644 index 5b41b0d27f0f..000000000000 --- a/include/clocksource/arm_generic.h +++ /dev/null @@ -1,21 +0,0 @@ -/* - * Copyright (C) 2012 ARM Ltd. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. - * - * 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, see <http://www.gnu.org/licenses/>. - */ -#ifndef __CLKSOURCE_ARM_GENERIC_H -#define __CLKSOURCE_ARM_GENERIC_H - -extern int arm_generic_timer_init(void); - -#endif |