Re: [PATCH 12/15] via-pmu: Wrap some uses of sleep_in_progresswith proper ifdef's
From: Kristian Mueller
Date: Wed Jan 04 2006 - 22:33:06 EST
Hi Ben
On Mi, 2006-01-04 at 17:01 -0500, Ben Collins wrote:
> Basically completes what's already in the rest of the driver.
> sleep_in_progress is only defined for pm+ppc32.
>
> Signed-off-by: Ben Collins <bcollins@xxxxxxxxxx>
We've already found a different solution to this in the Linuxppc-dev
list.
See:
http://patchwork.ozlabs.org/linuxppc/patch?id=3737
Fix compilation of via-pmu.c without Power Management support.
Signed-off-by: Kristian Mueller <Kristian-M@xxxxxxxxxxxxx>
Signed-off-by: Paul Mackerras <paulus@xxxxxxxxx>
---
--- linux/drivers/macintosh/via-pmu.c.orig2005-12-15 11:28:28.000000000
+0800
+++ linux/drivers/macintosh/via-pmu.c2005-12-15 12:20:43.000000000 +0800
@@ -157,8 +157,8 @@ static int pmu_version;
static int drop_interrupts;
#if defined(CONFIG_PM) && defined(CONFIG_PPC32)
static int option_lid_wakeup = 1;
-static int sleep_in_progress;
#endif /* CONFIG_PM && CONFIG_PPC32 */
+static int sleep_in_progress;
static unsigned long async_req_locks;
static unsigned int pmu_irq_stats[11];
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/