Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
  ALSA: us122l: fix missing unlock in usb_stream_hwdep_vm_fault()
  ALSA: hda - Fix quirk lists for realtek codecs
  ALSA: hda - Add support of ALC272
  ALSA: hda - Add ALC887 support
  ALSA: hda - Add ALC1200 support
  ALSA: hda - Fix PCI SSID of ASUS M90V
  ALSA: hda - Add auto mic switch in realtek auto-probe mode
  ALSA: Fix pxa2xx-ac97-lib.c compilation
  ALSA: ASoC: Hide TLV320AIC26 configuration option for non-OpenFirwmare users
  ALSA: hda: fix nid variable warning
  ALSA: ASoC: Fix compile-time warning for tlv320aic23.c

1 files changed, 6 insertions, 6 deletions

diff --git a/sound/arm/pxa2xx-ac97-lib.c b/sound/arm/pxa2xx-ac97-lib.c
index 99026dfb81ea..34c1d94f921e 100644
--- a/sound/arm/pxa2xx-ac97-lib.c
+++ b/sound/arm/pxa2xx-ac97-lib.c
@@ -50,7 +50,7 @@ unsigned short pxa2xx_ac97_read(struct snd_ac97 *ac97, unsigned short reg)
         mutex_lock(&car_mutex);
 
         /* set up primary or secondary codec space */
-        if ((cpu_is_pxa21x() || cpu_is_pxa25x()) && reg == AC97_GPIO_STATUS)
+        if (cpu_is_pxa25x() && reg == AC97_GPIO_STATUS)
                 reg_addr = ac97->num ? &SMC_REG_BASE : &PMC_REG_BASE;
         else
                 reg_addr = ac97->num ? &SAC_REG_BASE : &PAC_REG_BASE;
@@ -90,7 +90,7 @@ void pxa2xx_ac97_write(struct snd_ac97 *ac97, unsigned short reg,
         mutex_lock(&car_mutex);
 
         /* set up primary or secondary codec space */
-        if ((cpu_is_pxa21x() || cpu_is_pxa25x()) && reg == AC97_GPIO_STATUS)
+        if (cpu_is_pxa25x() && reg == AC97_GPIO_STATUS)
                 reg_addr = ac97->num ? &SMC_REG_BASE : &PMC_REG_BASE;
         else
                 reg_addr = ac97->num ? &SAC_REG_BASE : &PAC_REG_BASE;
@@ -200,7 +200,7 @@ static inline void pxa_ac97_cold_pxa3xx(void)
 bool pxa2xx_ac97_try_warm_reset(struct snd_ac97 *ac97)
 {
 #ifdef CONFIG_PXA25x
-        if (cpu_is_pxa21x() || cpu_is_pxa25x())
+        if (cpu_is_pxa25x())
                 pxa_ac97_warm_pxa25x();
         else
 #endif
@@ -230,7 +230,7 @@ EXPORT_SYMBOL_GPL(pxa2xx_ac97_try_warm_reset);
 bool pxa2xx_ac97_try_cold_reset(struct snd_ac97 *ac97)
 {
 #ifdef CONFIG_PXA25x
-        if (cpu_is_pxa21x() || cpu_is_pxa25x())
+        if (cpu_is_pxa25x())
                 pxa_ac97_cold_pxa25x();
         else
 #endif
@@ -301,7 +301,7 @@ EXPORT_SYMBOL_GPL(pxa2xx_ac97_hw_suspend);
 
 int pxa2xx_ac97_hw_resume(void)
 {
-        if (cpu_is_pxa21x() || cpu_is_pxa25x() || cpu_is_pxa27x()) {
+        if (cpu_is_pxa25x() || cpu_is_pxa27x()) {
                 pxa_gpio_mode(GPIO31_SYNC_AC97_MD);
                 pxa_gpio_mode(GPIO30_SDATA_OUT_AC97_MD);
                 pxa_gpio_mode(GPIO28_BITCLK_AC97_MD);
@@ -325,7 +325,7 @@ int __devinit pxa2xx_ac97_hw_probe(struct platform_device *dev)
         if (ret < 0)
                 goto err;
 
-        if (cpu_is_pxa21x() || cpu_is_pxa25x() || cpu_is_pxa27x()) {
+        if (cpu_is_pxa25x() || cpu_is_pxa27x()) {
                 pxa_gpio_mode(GPIO31_SYNC_AC97_MD);
                 pxa_gpio_mode(GPIO30_SDATA_OUT_AC97_MD);
                 pxa_gpio_mode(GPIO28_BITCLK_AC97_MD);