Merge remote-tracking branches 'asoc/topic/nau8825' and 'asoc/topic/pxa' into asoc...

diff --cc sound/soc/codecs/Kconfig
index cce4e96b625b13b40a25496f341e74273eaa8d90,cc60ab92b21d295d8b695cf0c2baa41eaf1a9527,0c9733ecd17f29a040ec3f2a4c7dfab8c59007e7..cfdafc4c11ea9a64c465eef6d9ac4ed3520c159a
--- 1/sound/soc/codecs/Kconfig
--- 2/sound/soc/codecs/Kconfig
--- 3/sound/soc/codecs/Kconfig
+++ b/sound/soc/codecs/Kconfig
@@@@ -81,6 -79,7 -79,7 +81,7 @@@@ config SND_SOC_ALL_CODEC
        select SND_SOC_MAX9877 if I2C
        select SND_SOC_MC13783 if MFD_MC13XXX
        select SND_SOC_ML26124 if I2C
  -     select SND_SOC_HDMI_CODEC
+ +     select SND_SOC_NAU8825 if I2C
        select SND_SOC_PCM1681 if I2C
        select SND_SOC_PCM1792A if SPI_MASTER
        select SND_SOC_PCM3008

diff --cc sound/soc/codecs/Makefile
index 783300aa11934137eb1479376bf31fa51ed0e8e2,d7b0f41690b2c12036bc988a4e211e4ab71b7cc1,4a32077954aee6aee2966ced2573991d1673b02a..f632fc42f59f08d9d6c72f6aac045d9fe28176a1
--- 1/sound/soc/codecs/Makefile
--- 2/sound/soc/codecs/Makefile
--- 3/sound/soc/codecs/Makefile
+++ b/sound/soc/codecs/Makefile
@@@@ -74,6 -72,7 -72,7 +74,7 @@@@ snd-soc-max98925-objs := max98925.
   snd-soc-max9850-objs := max9850.o
   snd-soc-mc13783-objs := mc13783.o
   snd-soc-ml26124-objs := ml26124.o
  -snd-soc-hdmi-codec-objs := hdmi.o
+ +snd-soc-nau8825-objs := nau8825.o
   snd-soc-pcm1681-objs := pcm1681.o
   snd-soc-pcm1792a-codec-objs := pcm1792a.o
   snd-soc-pcm3008-objs := pcm3008.o
@@@@ -268,6 -264,7 -264,7 +269,7 @@@@ obj-$(CONFIG_SND_SOC_MAX98925)    += snd-s
   obj-$(CONFIG_SND_SOC_MAX9850)        += snd-soc-max9850.o
   obj-$(CONFIG_SND_SOC_MC13783)        += snd-soc-mc13783.o
   obj-$(CONFIG_SND_SOC_ML26124)        += snd-soc-ml26124.o
  -obj-$(CONFIG_SND_SOC_HDMI_CODEC) += snd-soc-hdmi-codec.o
+ +obj-$(CONFIG_SND_SOC_NAU8825)   += snd-soc-nau8825.o
   obj-$(CONFIG_SND_SOC_PCM1681)        += snd-soc-pcm1681.o
   obj-$(CONFIG_SND_SOC_PCM1792A)       += snd-soc-pcm1792a-codec.o
   obj-$(CONFIG_SND_SOC_PCM3008)        += snd-soc-pcm3008.o