git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'stable-3.2' into pandora-3.2
[pandora-kernel.git]
/
arch
/
arm
/
plat-omap
/
include
/
plat
/
omap_device.h
diff --git
a/arch/arm/plat-omap/include/plat/omap_device.h
b/arch/arm/plat-omap/include/plat/omap_device.h
index
51423d2
..
d93ac93
100644
(file)
--- a/
arch/arm/plat-omap/include/plat/omap_device.h
+++ b/
arch/arm/plat-omap/include/plat/omap_device.h
@@
-36,7
+36,7
@@
#include <plat/omap_hwmod.h>
-extern struct dev
ice omap_device_parent
;
+extern struct dev
_pm_domain omap_device_pm_domain
;
/* omap_device._state values */
#define OMAP_DEVICE_STATE_UNKNOWN 0