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 'egalax' into for-linus
[pandora-kernel.git]
/
arch
/
arm
/
plat-omap
/
include
/
plat
/
omap_hwmod.h
diff --git
a/arch/arm/plat-omap/include/plat/omap_hwmod.h
b/arch/arm/plat-omap/include/plat/omap_hwmod.h
index
440b416
..
36d6ea5
100644
(file)
--- a/
arch/arm/plat-omap/include/plat/omap_hwmod.h
+++ b/
arch/arm/plat-omap/include/plat/omap_hwmod.h
@@
-294,8
+294,8
@@
struct omap_hwmod_class_sysconfig {
u16 rev_offs;
u16 sysc_offs;
u16 syss_offs;
+ u16 sysc_flags;
u8 idlemodes;
- u8 sysc_flags;
u8 clockact;
struct omap_hwmod_sysc_fields *sysc_fields;
};