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 'for-38-rc2' of git://codeaurora.org/quic/kernel/davidb/linux-msm
[pandora-kernel.git]
/
arch
/
arm
/
mach-omap2
/
clockdomain.h
diff --git
a/arch/arm/mach-omap2/clockdomain.h
b/arch/arm/mach-omap2/clockdomain.h
index
de3faa2
..
9b459c2
100644
(file)
--- a/
arch/arm/mach-omap2/clockdomain.h
+++ b/
arch/arm/mach-omap2/clockdomain.h
@@
-103,9
+103,7
@@
struct clockdomain {
const char *name;
struct powerdomain *ptr;
} pwrdm;
-#if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3)
const u16 clktrctrl_mask;
-#endif
const u8 flags;
const u8 dep_bit;
const u8 prcm_partition;