projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'drm-nouveau-pony' of git://git.kernel.org/pub/scm/linux/kernel/git...
[linux-2.6-block.git]
/
arch
/
arm
/
plat-omap
/
omap-pm-noop.c
diff --git
a/arch/arm/plat-omap/omap-pm-noop.c
b/arch/arm/plat-omap/omap-pm-noop.c
index e98f0a2a6c266ba71d54023d3ccc242d96a65154..186bca82cfab76dbe64cb8ebb883efedbee18ba2 100644
(file)
--- a/
arch/arm/plat-omap/omap-pm-noop.c
+++ b/
arch/arm/plat-omap/omap-pm-noop.c
@@
-22,9
+22,9
@@
#include <linux/device.h>
/* Interface documentation is in mach/omap-pm.h */
-#include <
mach
/omap-pm.h>
+#include <
plat
/omap-pm.h>
-#include <
mach
/powerdomain.h>
+#include <
plat
/powerdomain.h>
struct omap_opp *dsp_opps;
struct omap_opp *mpu_opps;