diff options
author | Tony Lindgren <tony@atomide.com> | 2011-06-29 03:35:18 -0700 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2011-06-29 03:35:18 -0700 |
commit | 332acd9e534e0bc8713d2cb90dd2d4d5f2485401 (patch) | |
tree | 8627f57b3c43f3612c91760292f7e7d1b47eb3d1 /arch/arm/mach-omap2/timer-gp.h | |
parent | bafe2721a0fbd1cc1af04384133684f660f3658e (diff) | |
parent | 0f622e8cae379ee17e1ffe867336b74c5b16f958 (diff) | |
download | talos-op-linux-332acd9e534e0bc8713d2cb90dd2d4d5f2485401.tar.gz talos-op-linux-332acd9e534e0bc8713d2cb90dd2d4d5f2485401.zip |
Merge branch 'devel-timer' into devel-cleanup
Diffstat (limited to 'arch/arm/mach-omap2/timer-gp.h')
-rw-r--r-- | arch/arm/mach-omap2/timer-gp.h | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/arch/arm/mach-omap2/timer-gp.h b/arch/arm/mach-omap2/timer-gp.h deleted file mode 100644 index 5c1072c6783b..000000000000 --- a/arch/arm/mach-omap2/timer-gp.h +++ /dev/null @@ -1,16 +0,0 @@ -/* - * OMAP2/3 GPTIMER support.headers - * - * Copyright (C) 2009 Nokia Corporation - * - * This file is subject to the terms and conditions of the GNU General Public - * License. See the file "COPYING" in the main directory of this archive - * for more details. - */ - -#ifndef __ARCH_ARM_PLAT_OMAP_INCLUDE_MACH_TIMER_GP_H -#define __ARCH_ARM_PLAT_OMAP_INCLUDE_MACH_TIMER_GP_H - -extern int __init omap2_gp_clockevent_set_gptimer(u8 id); - -#endif |