All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] arm: omap1: fix build when !CONFIG_OMAP_32K_TIMER
@ 2014-01-13 18:03 ` Felipe Balbi
  0 siblings, 0 replies; 4+ messages in thread
From: Felipe Balbi @ 2014-01-13 18:03 UTC (permalink / raw)
  To: Tony Lindgren
  Cc: Linux OMAP Mailing List, Linux ARM Kernel Mailing List, Felipe Balbi

If CONFIG_OMAP_32K_TIMER isn't enabled, we will
try to use enable_dyn_sleep which wasn't defined
anywhere.

In order to fix the problem, we always define
enable_dyn_sleep as 0 when !CONFIG_OMAP_32K_TIMER.

Signed-off-by: Felipe Balbi <balbi@ti.com>
---
 arch/arm/mach-omap1/pm.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/arch/arm/mach-omap1/pm.c b/arch/arm/mach-omap1/pm.c
index 40a1ae3..dbee729 100644
--- a/arch/arm/mach-omap1/pm.c
+++ b/arch/arm/mach-omap1/pm.c
@@ -71,7 +71,11 @@ static unsigned int mpui7xx_sleep_save[MPUI7XX_SLEEP_SAVE_SIZE];
 static unsigned int mpui1510_sleep_save[MPUI1510_SLEEP_SAVE_SIZE];
 static unsigned int mpui1610_sleep_save[MPUI1610_SLEEP_SAVE_SIZE];
 
-#ifdef CONFIG_OMAP_32K_TIMER
+#ifndef CONFIG_OMAP_32K_TIMER
+
+static unsigned short enable_dyn_sleep = 0;
+
+#else
 
 static unsigned short enable_dyn_sleep = 1;
 
-- 
1.8.5.2


^ permalink raw reply related	[flat|nested] 4+ messages in thread
* [PATCH] arm: omap1: fix build when !CONFIG_OMAP_32K_TIMER
@ 2014-01-13 18:03 ` Felipe Balbi
  0 siblings, 0 replies; 4+ messages in thread
From: Felipe Balbi @ 2014-01-13 18:03 UTC (permalink / raw)
  To: linux-arm-kernel

If CONFIG_OMAP_32K_TIMER isn't enabled, we will
try to use enable_dyn_sleep which wasn't defined
anywhere.

In order to fix the problem, we always define
enable_dyn_sleep as 0 when !CONFIG_OMAP_32K_TIMER.

Signed-off-by: Felipe Balbi <balbi@ti.com>
---
 arch/arm/mach-omap1/pm.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/arch/arm/mach-omap1/pm.c b/arch/arm/mach-omap1/pm.c
index 40a1ae3..dbee729 100644
--- a/arch/arm/mach-omap1/pm.c
+++ b/arch/arm/mach-omap1/pm.c
@@ -71,7 +71,11 @@ static unsigned int mpui7xx_sleep_save[MPUI7XX_SLEEP_SAVE_SIZE];
 static unsigned int mpui1510_sleep_save[MPUI1510_SLEEP_SAVE_SIZE];
 static unsigned int mpui1610_sleep_save[MPUI1610_SLEEP_SAVE_SIZE];
 
-#ifdef CONFIG_OMAP_32K_TIMER
+#ifndef CONFIG_OMAP_32K_TIMER
+
+static unsigned short enable_dyn_sleep = 0;
+
+#else
 
 static unsigned short enable_dyn_sleep = 1;
 
-- 
1.8.5.2

^ permalink raw reply related	[flat|nested] 4+ messages in thread
* Re: [PATCH] arm: omap1: fix build when !CONFIG_OMAP_32K_TIMER
  2014-01-13 18:03 ` Felipe Balbi
@ 2014-02-13 22:52   ` Tony Lindgren
  -1 siblings, 0 replies; 4+ messages in thread
From: Tony Lindgren @ 2014-02-13 22:52 UTC (permalink / raw)
  To: Felipe Balbi; +Cc: Linux OMAP Mailing List, Linux ARM Kernel Mailing List

* Felipe Balbi <balbi@ti.com> [140113 10:06]:
> If CONFIG_OMAP_32K_TIMER isn't enabled, we will
> try to use enable_dyn_sleep which wasn't defined
> anywhere.
> 
> In order to fix the problem, we always define
> enable_dyn_sleep as 0 when !CONFIG_OMAP_32K_TIMER.
> 
> Signed-off-by: Felipe Balbi <balbi@ti.com>

Thanks applying into omap-for-v3.14/fixes.

Tony

^ permalink raw reply	[flat|nested] 4+ messages in thread
* [PATCH] arm: omap1: fix build when !CONFIG_OMAP_32K_TIMER
@ 2014-02-13 22:52   ` Tony Lindgren
  0 siblings, 0 replies; 4+ messages in thread
From: Tony Lindgren @ 2014-02-13 22:52 UTC (permalink / raw)
  To: linux-arm-kernel

* Felipe Balbi <balbi@ti.com> [140113 10:06]:
> If CONFIG_OMAP_32K_TIMER isn't enabled, we will
> try to use enable_dyn_sleep which wasn't defined
> anywhere.
> 
> In order to fix the problem, we always define
> enable_dyn_sleep as 0 when !CONFIG_OMAP_32K_TIMER.
> 
> Signed-off-by: Felipe Balbi <balbi@ti.com>

Thanks applying into omap-for-v3.14/fixes.

Tony

^ permalink raw reply	[flat|nested] 4+ messages in thread
end of thread, other threads:[~2014-02-13 22:52 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-01-13 18:03 [PATCH] arm: omap1: fix build when !CONFIG_OMAP_32K_TIMER Felipe Balbi
2014-01-13 18:03 ` Felipe Balbi
2014-02-13 22:52 ` Tony Lindgren
2014-02-13 22:52   ` Tony Lindgren

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.