public inbox for linux-omap@vger.kernel.org
 help / color / mirror / Atom feed
From: Charles Manning <manningc2@actrix.gen.nz>
To: linux-omap@vger.kernel.org
Subject: Fix pm24xx.c compilation  problem
Date: Thu, 23 Dec 2010 09:19:26 +1300	[thread overview]
Message-ID: <201012230919.26344.manningc2@actrix.gen.nz> (raw)

arch/arm/mach-omap2/pm24xx.c doesn't compile without CONFIG_SUSPEND

diff --git a/arch/arm/mach-omap2/pm24xx.c b/arch/arm/mach-omap2/pm24xx.c
index aaeea49..ae6abda 100644
--- a/arch/arm/mach-omap2/pm24xx.c
+++ b/arch/arm/mach-omap2/pm24xx.c
@@ -53,8 +53,8 @@
 #include <plat/powerdomain.h>
 #include <plat/clockdomain.h>
 
-#ifdef CONFIG_SUSPEND
 static suspend_state_t suspend_state = PM_SUSPEND_ON;
+#ifdef CONFIG_SUSPEND
 static inline bool is_suspending(void)
 {
        return (suspend_state != PM_SUSPEND_ON);
@@ -314,6 +314,7 @@ static int omap2_pm_prepare(void)
 
 static int omap2_pm_suspend(void)
 {
+#ifdef CONFIG_SUSPEND
        u32 wken_wkup, mir1;
 
        wken_wkup = prm_read_mod_reg(WKUP_MOD, PM_WKEN);
@@ -329,7 +330,7 @@ static int omap2_pm_suspend(void)
 
        omap_writel(mir1, 0x480fe0a4);
        prm_write_mod_reg(wken_wkup, WKUP_MOD, PM_WKEN);
-
+#endif
        return 0;
 }


             reply	other threads:[~2010-12-22 20:19 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-12-22 20:19 Charles Manning [this message]
2010-12-22 22:22 ` Fix pm24xx.c compilation problem Kevin Hilman
2010-12-22 22:53   ` Charles Manning

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=201012230919.26344.manningc2@actrix.gen.nz \
    --to=manningc2@actrix.gen.nz \
    --cc=linux-omap@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox