projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'iwlwifi-next-for-kalle-2014-12-30' of https://git.kernel.org/pub/scm/linux...
[cascardo/linux.git]
/
arch
/
arm
/
mach-omap2
/
omap_device.c
diff --git
a/arch/arm/mach-omap2/omap_device.c
b/arch/arm/mach-omap2/omap_device.c
index
8c58b71
..
be9541e
100644
(file)
--- a/
arch/arm/mach-omap2/omap_device.c
+++ b/
arch/arm/mach-omap2/omap_device.c
@@
-588,7
+588,7
@@
odbs_exit:
return ERR_PTR(ret);
}
-#ifdef CONFIG_PM
_RUNTIME
+#ifdef CONFIG_PM
static int _od_runtime_suspend(struct device *dev)
{
struct platform_device *pdev = to_platform_device(dev);