Merge branch 'for_3.1/pm-fixes-2' of git://gitorious.org/khilman/linux-omap-pm into fixes
This commit is contained in:
commit
15ce92861f
1 changed files with 3 additions and 0 deletions
|
@ -615,6 +615,9 @@ static int _od_resume_noirq(struct device *dev)
|
||||||
|
|
||||||
return pm_generic_resume_noirq(dev);
|
return pm_generic_resume_noirq(dev);
|
||||||
}
|
}
|
||||||
|
#else
|
||||||
|
#define _od_suspend_noirq NULL
|
||||||
|
#define _od_resume_noirq NULL
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
static struct dev_pm_domain omap_device_pm_domain = {
|
static struct dev_pm_domain omap_device_pm_domain = {
|
||||||
|
|
Loading…
Add table
Reference in a new issue