From 150a0bd861b0032f0272d982a00b2e980b94d417 Mon Sep 17 00:00:00 2001 From: Scott Williams Date: Tue, 28 Jun 2011 13:09:18 -0700 Subject: ARM: tegra: power: Use CONFIG_PM_SLEEP instead of CONFIG_PM For Linux 2.6.39, CONFIG_PM_SLEEP is the proper kernel configuration parameter to use on Tegra for power management, and not CONFIG_PM. CONFIG_PM does not have the required dependency on CONFIG_SUSPEND necessary to pull in the CPU suspend/resume functionality used by Tegra. Also fixes compilation errors when CONFIG_PM and by implication CONFIG_PM_SLEEP are not configured. Change-Id: I8bb380ae7c6b22759bfbc223febc28f585111aad Reviewed-on: http://git-master/r/40458 Tested-by: Daniel Willemsen Reviewed-by: Scott Williams Reviewed-by: Daniel Willemsen Rebase-Id: R61d656cd67439aa9f466c381845d7a4685fc8648 --- drivers/gpio/gpio-tegra.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'drivers/gpio') diff --git a/drivers/gpio/gpio-tegra.c b/drivers/gpio/gpio-tegra.c index a5688905cfed..e42ebe0be017 100644 --- a/drivers/gpio/gpio-tegra.c +++ b/drivers/gpio/gpio-tegra.c @@ -83,7 +83,7 @@ struct tegra_gpio_bank { int bank; int irq; spinlock_t lvl_lock[4]; -#ifdef CONFIG_PM +#ifdef CONFIG_PM_SLEEP u32 cnf[4]; u32 out[4]; u32 oe[4]; @@ -274,7 +274,7 @@ static void tegra_gpio_irq_handler(unsigned int irq, struct irq_desc *desc) } -#ifdef CONFIG_PM +#ifdef CONFIG_PM_SLEEP static void tegra_gpio_resume(void) { unsigned long flags; -- cgit v1.2.3