* [patch 2.6.21-rc5-omap1-git] fix OMAP1 dmtimer build warning
@ 2007-04-02 19:45 David Brownell
2007-04-03 18:51 ` Tony Lindgren
0 siblings, 1 reply; 2+ messages in thread
From: David Brownell @ 2007-04-02 19:45 UTC (permalink / raw)
To: linux-omap-open-source
Remove the OMAP1 version of omap_dm_timer_get_fclk(), and its associated
compile-time warning. It would only BUG() if called, while it's only
called on OMAP2.
Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
--- a/arch/arm/plat-omap/dmtimer.c
+++ b/arch/arm/plat-omap/dmtimer.c
@@ -271,11 +271,6 @@ int omap_dm_timer_get_irq(struct omap_dm_timer *timer)
#if defined(CONFIG_ARCH_OMAP1)
-struct clk *omap_dm_timer_get_fclk(struct omap_dm_timer *timer)
-{
- BUG();
-}
-
/**
* omap_dm_timer_modify_idlect_mask - Check if any running timers use ARMXOR
* @inputmask: current value of idlect mask
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [patch 2.6.21-rc5-omap1-git] fix OMAP1 dmtimer build warning
2007-04-02 19:45 [patch 2.6.21-rc5-omap1-git] fix OMAP1 dmtimer build warning David Brownell
@ 2007-04-03 18:51 ` Tony Lindgren
0 siblings, 0 replies; 2+ messages in thread
From: Tony Lindgren @ 2007-04-03 18:51 UTC (permalink / raw)
To: David Brownell; +Cc: linux-omap-open-source
* David Brownell <david-b@pacbell.net> [070402 17:11]:
> Remove the OMAP1 version of omap_dm_timer_get_fclk(), and its associated
> compile-time warning. It would only BUG() if called, while it's only
> called on OMAP2.
>
> Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
>
> --- a/arch/arm/plat-omap/dmtimer.c
> +++ b/arch/arm/plat-omap/dmtimer.c
> @@ -271,11 +271,6 @@ int omap_dm_timer_get_irq(struct omap_dm_timer *timer)
>
> #if defined(CONFIG_ARCH_OMAP1)
>
> -struct clk *omap_dm_timer_get_fclk(struct omap_dm_timer *timer)
> -{
> - BUG();
> -}
> -
> /**
> * omap_dm_timer_modify_idlect_mask - Check if any running timers use ARMXOR
> * @inputmask: current value of idlect mask
Pushing to omap-upstream branch.
Tony
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2007-04-03 18:51 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-04-02 19:45 [patch 2.6.21-rc5-omap1-git] fix OMAP1 dmtimer build warning David Brownell
2007-04-03 18:51 ` Tony Lindgren
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox