diff options
Diffstat (limited to 'extras/recipes-kernel/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm/0002-OMAP4-PM-remove-redundant-ifdef-CONFIG_PM.patch')
-rw-r--r-- | extras/recipes-kernel/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm/0002-OMAP4-PM-remove-redundant-ifdef-CONFIG_PM.patch | 41 |
1 files changed, 41 insertions, 0 deletions
diff --git a/extras/recipes-kernel/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm/0002-OMAP4-PM-remove-redundant-ifdef-CONFIG_PM.patch b/extras/recipes-kernel/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm/0002-OMAP4-PM-remove-redundant-ifdef-CONFIG_PM.patch new file mode 100644 index 00000000..7b137925 --- /dev/null +++ b/extras/recipes-kernel/linux/linux-omap-2.6.39/pm/linux-omap-2.6.39-ti-pm/0002-OMAP4-PM-remove-redundant-ifdef-CONFIG_PM.patch | |||
@@ -0,0 +1,41 @@ | |||
1 | From 37fb1c8eeecd39542716d3d0c7c5e3ca0eb198f8 Mon Sep 17 00:00:00 2001 | ||
2 | From: Nishanth Menon <nm@ti.com> | ||
3 | Date: Sun, 13 Mar 2011 09:07:23 +0530 | ||
4 | Subject: [PATCH 02/12] OMAP4: PM: remove redundant #ifdef CONFIG_PM | ||
5 | |||
6 | pm44xx.c is built only when CONFIG_PM is setup, | ||
7 | remove redundant CONFIG_PM check. | ||
8 | |||
9 | This also fixes: | ||
10 | https://bugzilla.kernel.org/show_bug.cgi?id=25022 | ||
11 | |||
12 | Reported-by: Martin Etti <ettl.martin@gmx.de> | ||
13 | |||
14 | Signed-off-by: Nishanth Menon <nm@ti.com> | ||
15 | Signed-off-by: Kevin Hilman <khilman@ti.com> | ||
16 | Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> | ||
17 | --- | ||
18 | arch/arm/mach-omap2/pm44xx.c | 2 -- | ||
19 | 1 files changed, 0 insertions(+), 2 deletions(-) | ||
20 | |||
21 | diff --git a/arch/arm/mach-omap2/pm44xx.c b/arch/arm/mach-omap2/pm44xx.c | ||
22 | index 76cfff2..59a870b 100644 | ||
23 | --- a/arch/arm/mach-omap2/pm44xx.c | ||
24 | +++ b/arch/arm/mach-omap2/pm44xx.c | ||
25 | @@ -105,13 +105,11 @@ static int __init omap4_pm_init(void) | ||
26 | |||
27 | pr_err("Power Management for TI OMAP4.\n"); | ||
28 | |||
29 | -#ifdef CONFIG_PM | ||
30 | ret = pwrdm_for_each(pwrdms_setup, NULL); | ||
31 | if (ret) { | ||
32 | pr_err("Failed to setup powerdomains\n"); | ||
33 | goto err2; | ||
34 | } | ||
35 | -#endif | ||
36 | |||
37 | #ifdef CONFIG_SUSPEND | ||
38 | suspend_set_ops(&omap_pm_ops); | ||
39 | -- | ||
40 | 1.6.6.1 | ||
41 | |||