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]
/
sound
/
soc
/
codecs
/
wl1273.c
diff --git
a/sound/soc/codecs/wl1273.c
b/sound/soc/codecs/wl1273.c
index
1ad0d5a
..
c8a874d
100644
(file)
--- a/
sound/soc/codecs/wl1273.c
+++ b/
sound/soc/codecs/wl1273.c
@@
-3,7
+3,7
@@
*
* Author: Matti Aaltonen, <matti.j.aaltonen@nokia.com>
*
*
* Author: Matti Aaltonen, <matti.j.aaltonen@nokia.com>
*
- * Copyright: (C) 2010 Nokia Corporation
+ * Copyright: (C) 2010
, 2011
Nokia Corporation
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@
-179,7
+179,12
@@
static int snd_wl1273_get_audio_route(struct snd_kcontrol *kcontrol,
return 0;
}
return 0;
}
-static const char *wl1273_audio_route[] = { "Bt", "FmRx", "FmTx" };
+/*
+ * TODO: Implement the audio routing in the driver. Now this control
+ * only indicates the setting that has been done elsewhere (in the user
+ * space).
+ */
+static const char * const wl1273_audio_route[] = { "Bt", "FmRx", "FmTx" };
static int snd_wl1273_set_audio_route(struct snd_kcontrol *kcontrol,
struct snd_ctl_elem_value *ucontrol)
static int snd_wl1273_set_audio_route(struct snd_kcontrol *kcontrol,
struct snd_ctl_elem_value *ucontrol)
@@
-239,7
+244,7
@@
static int snd_wl1273_fm_audio_put(struct snd_kcontrol *kcontrol,
return 1;
}
return 1;
}
-static const char *wl1273_audio_strings[] = { "Digital", "Analog" };
+static const char *
const
wl1273_audio_strings[] = { "Digital", "Analog" };
static const struct soc_enum wl1273_audio_enum =
SOC_ENUM_SINGLE_EXT(ARRAY_SIZE(wl1273_audio_strings),
static const struct soc_enum wl1273_audio_enum =
SOC_ENUM_SINGLE_EXT(ARRAY_SIZE(wl1273_audio_strings),