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 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...
[pandora-kernel.git]
/
arch
/
arm
/
mach-u300
/
clock.h
diff --git
a/arch/arm/mach-u300/clock.h
b/arch/arm/mach-u300/clock.h
index
c34f3ea
..
4f50ca8
100644
(file)
--- a/
arch/arm/mach-u300/clock.h
+++ b/
arch/arm/mach-u300/clock.h
@@
-31,7
+31,7
@@
struct clk {
bool reset;
__u16 clk_val;
__s8 usecount;
-
__u32
res_reg;
+
void __iomem *
res_reg;
__u16 res_mask;
bool hw_ctrld;