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 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied...
[pandora-kernel.git]
/
arch
/
arm
/
mach-davinci
/
mux.h
diff --git
a/arch/arm/mach-davinci/mux.h
b/arch/arm/mach-davinci/mux.h
index
adc8694
..
5aad1e7
100644
(file)
--- a/
arch/arm/mach-davinci/mux.h
+++ b/
arch/arm/mach-davinci/mux.h
@@
-20,7
+20,7
@@
.name = #desc, \
.debug = dbg, \
.mux_reg_name = "PINMUX"#muxreg, \
.name = #desc, \
.debug = dbg, \
.mux_reg_name = "PINMUX"#muxreg, \
- .mux_reg = PINMUX
##muxreg
, \
+ .mux_reg = PINMUX
(muxreg)
, \
.mask_offset = mode_offset, \
.mask = mode_mask, \
.mode = mux_mode, \
.mask_offset = mode_offset, \
.mask = mode_mask, \
.mode = mux_mode, \