Merge pull request #580 from wigyori/cc-libpcap

[15.05/openwrt.git] / target / linux / brcm2708 / patches-3.18 / 0043-pcm512x-Use-a-range-macro-for-Volume-and-rename-to-P.patch

diff --git a/target/linux/brcm2708/patches-3.18/0043-pcm512x-Use-a-range-macro-for-Volume-and-rename-to-P.patch b/target/linux/brcm2708/patches-3.18/0043-pcm512x-Use-a-range-macro-for-Volume-and-rename-to-P.patch
old mode 100755 (executable)
new mode 100644 (file)
index ab5e363..1ede655
--- a/target/linux/brcm2708/patches-3.18/0043-pcm512x-Use-a-range-macro-for-Volume-and-rename-to-P.patch
+++ b/target/linux/brcm2708/patches-3.18/0043-pcm512x-Use-a-range-macro-for-Volume-and-rename-to-P.patch
@@ -10,11 +10,9 @@ DAC ouput stages.
  sound/soc/codecs/pcm512x.c | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
-diff --git a/sound/soc/codecs/pcm512x.c b/sound/soc/codecs/pcm512x.c
-index 640c991..b405719 100644
 --- a/sound/soc/codecs/pcm512x.c
 +++ b/sound/soc/codecs/pcm512x.c
-@@ -259,8 +259,8 @@ static const struct soc_enum pcm512x_veds =
+@@ -259,8 +259,8 @@ static const struct soc_enum pcm512x_ved
                        pcm512x_ramp_step_text);
  
  static const struct snd_kcontrol_new pcm512x_controls[] = {
@@ -22,9 +20,6 @@ index 640c991..b405719 100644
 -               PCM512x_DIGITAL_VOLUME_3, 0, 255, 1, digital_tlv),
 +SOC_DOUBLE_R_RANGE_TLV("PCM", PCM512x_DIGITAL_VOLUME_2,
 +               PCM512x_DIGITAL_VOLUME_3, 0, 40, 255, 1, digital_tlv),
- SOC_DOUBLE_TLV("Playback Volume", PCM512x_ANALOG_GAIN_CTRL,
+ SOC_DOUBLE_TLV("Analogue Playback Volume", PCM512x_ANALOG_GAIN_CTRL,
               PCM512x_LAGN_SHIFT, PCM512x_RAGN_SHIFT, 1, 1, analog_tlv),
- SOC_DOUBLE_TLV("Playback Boost Volume", PCM512x_ANALOG_GAIN_BOOST,
--- 
-1.8.3.2
-
+ SOC_DOUBLE_TLV("Analogue Playback Boost Volume", PCM512x_ANALOG_GAIN_BOOST,