diff options
author | Olof Johansson <olof@lixom.net> | 2013-01-15 10:56:50 -0800 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2013-01-15 10:57:24 -0800 |
commit | 2ea0dde7653342d363144b17cb39932e27428e9a (patch) | |
tree | b4316bb625ef7f216713e0f1221bdfff8a113379 /include | |
parent | f8060f5446b1f2782f0a8ca9be2d870ea4198aee (diff) | |
parent | 41d16512ebea6938b95c5e4f2ae008914e91abc1 (diff) |
Merge branch 'vt8500/timer' into next/cleanup
* vt8500/timer:
timer: vt8500: Convert vt8500 to use CLKSRC_OF
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/vt8500_timer.h | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/include/linux/vt8500_timer.h b/include/linux/vt8500_timer.h deleted file mode 100644 index 33b0ee87d083..000000000000 --- a/include/linux/vt8500_timer.h +++ /dev/null @@ -1,22 +0,0 @@ -/* - * Copyright 2012 Tony Prisk <linux@prisktech.co.nz> - * - * 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. - */ - -#ifndef __VT8500_TIMER_H -#define __VT8500_TIMER_H - -#include <asm/mach/time.h> - -void vt8500_timer_init(void); - -#endif |