diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2013-05-06 23:43:45 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2013-05-06 23:43:45 +0200 |
| commit | 442a33ebce9e02a2dd6662f16c9f2aad834d0115 (patch) | |
| tree | ca8654a286f61da917318645cab9e061095ecdba /arch/arm/mach-omap2/common.h | |
| parent | a94d236dc355f374857ee4e6e78b7dec8a0f29e3 (diff) | |
| parent | f31c2f1c68aff83277eddc6798adf3438e9c680a (diff) | |
| download | op-kernel-dev-442a33ebce9e02a2dd6662f16c9f2aad834d0115.zip op-kernel-dev-442a33ebce9e02a2dd6662f16c9f2aad834d0115.tar.gz | |
Merge branch 'late/clksrc' into late/cleanup
There is no reason to keep the clksrc cleanups separate from the
other cleanups, and this resolves some merge conflicts.
Conflicts:
arch/arm/mach-spear/spear13xx.c
drivers/irqchip/Makefile
Diffstat (limited to 'arch/arm/mach-omap2/common.h')
| -rw-r--r-- | arch/arm/mach-omap2/common.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/common.h b/arch/arm/mach-omap2/common.h index d6ba13e..272490e 100644 --- a/arch/arm/mach-omap2/common.h +++ b/arch/arm/mach-omap2/common.h @@ -82,8 +82,7 @@ extern void omap2_init_common_infrastructure(void); extern void omap2_sync32k_timer_init(void); extern void omap3_sync32k_timer_init(void); extern void omap3_secure_sync32k_timer_init(void); -extern void omap3_gp_gptimer_timer_init(void); -extern void omap3_am33xx_gptimer_timer_init(void); +extern void omap3_gptimer_timer_init(void); extern void omap4_local_timer_init(void); extern void omap5_realtime_timer_init(void); |
