projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
[cascardo/linux.git]
/
arch
/
arm
/
mach-omap2
/
powerdomains2xxx_data.c
diff --git
a/arch/arm/mach-omap2/powerdomains2xxx_data.c
b/arch/arm/mach-omap2/powerdomains2xxx_data.c
index
e136895
..
9b1a335
100644
(file)
--- a/
arch/arm/mach-omap2/powerdomains2xxx_data.c
+++ b/
arch/arm/mach-omap2/powerdomains2xxx_data.c
@@
-14,9
+14,8
@@
#include <linux/kernel.h>
#include <linux/init.h>
-#include
<plat/powerdomain.h>
+#include
"powerdomain.h"
#include "powerdomains2xxx_3xxx_data.h"
-#include "powerdomains.h"
#include "prcm-common.h"
#include "prm2xxx_3xxx.h"