git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branches 'topic/owner' and 'topic/reg-default' of git://git.kernel.org/pub...
[sfrench/cifs-2.6.git]
/
sound
/
soc
/
codecs
/
wm8996.c
diff --git
a/sound/soc/codecs/wm8996.c
b/sound/soc/codecs/wm8996.c
index 29b6688fb6ee2ce21d8fdb75d970ad11ef416c86..66c09556da79e9edaeb2e99df9c36e9b4147161a 100644
(file)
--- a/
sound/soc/codecs/wm8996.c
+++ b/
sound/soc/codecs/wm8996.c
@@
-117,7
+117,7
@@
WM8996_REGULATOR_EVENT(0)
WM8996_REGULATOR_EVENT(1)
WM8996_REGULATOR_EVENT(2)
WM8996_REGULATOR_EVENT(1)
WM8996_REGULATOR_EVENT(2)
-static struct reg_default wm8996_reg[] = {
+static
const
struct reg_default wm8996_reg[] = {
{ WM8996_POWER_MANAGEMENT_1, 0x0 },
{ WM8996_POWER_MANAGEMENT_2, 0x0 },
{ WM8996_POWER_MANAGEMENT_3, 0x0 },
{ WM8996_POWER_MANAGEMENT_1, 0x0 },
{ WM8996_POWER_MANAGEMENT_2, 0x0 },
{ WM8996_POWER_MANAGEMENT_3, 0x0 },