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] soc at91 minor bug fixes
  [ALSA] soc - at91-pcm - Fix line wrapping
  pcspkr: fix dependancies

3 files changed, 10 insertions, 7 deletions

diff --git a/sound/drivers/Kconfig b/sound/drivers/Kconfig
index a78a8d045175..379bcb074463 100644
--- a/sound/drivers/Kconfig
+++ b/sound/drivers/Kconfig
@@ -5,8 +5,8 @@ menu "Generic devices"
 
 
 config SND_PCSP
-        tristate "Internal PC speaker support"
-        depends on X86_PC && HIGH_RES_TIMERS
+        tristate "PC-Speaker support"
+        depends on PCSPKR_PLATFORM && X86_PC && HIGH_RES_TIMERS
         depends on INPUT
         depends on SND
         select SND_PCM
diff --git a/sound/soc/at91/at91-pcm.c b/sound/soc/at91/at91-pcm.c
index 67c88e322fb1..ccac6bd2889c 100644
--- a/sound/soc/at91/at91-pcm.c
+++ b/sound/soc/at91/at91-pcm.c
@@ -103,7 +103,8 @@ static void at91_pcm_dma_irq(u32 ssc_sr,
                 if (prtd->period_ptr >= prtd->dma_buffer_end) {
                         prtd->period_ptr = prtd->dma_buffer;
                 }
-                at91_ssc_write(params->ssc_base + params->pdc->xnpr, prtd->period_ptr);
+                at91_ssc_write(params->ssc_base + params->pdc->xnpr,
+                               prtd->period_ptr);
                 at91_ssc_write(params->ssc_base + params->pdc->xncr,
                                 prtd->period_size / params->pdc_xfer_size);
         }
@@ -191,10 +192,12 @@ static int at91_pcm_trigger(struct snd_pcm_substream *substream,
                 at91_ssc_write(params->ssc_base + AT91_SSC_IER,
                         params->mask->ssc_endx | params->mask->ssc_endbuf);
 
-                at91_ssc_write(params->ssc_base + ATMEL_PDC_PTCR, params->mask->pdc_enable);
+                at91_ssc_write(params->ssc_base + ATMEL_PDC_PTCR,
+                        params->mask->pdc_enable);
 
-                DBG("sr=%lx imr=%lx\n", at91_ssc_read(params->ssc_base + AT91_SSC_SR),
-                                        at91_ssc_read(params->ssc_base + AT91_SSC_IER));
+                DBG("sr=%lx imr=%lx\n",
+                    at91_ssc_read(params->ssc_base + AT91_SSC_SR),
+                    at91_ssc_read(params->ssc_base + AT91_SSC_IMR));
                 break;
 
         case SNDRV_PCM_TRIGGER_STOP:
diff --git a/sound/soc/at91/at91-ssc.c b/sound/soc/at91/at91-ssc.c
index f642d2dd4ec3..bc35d00a38f8 100644
--- a/sound/soc/at91/at91-ssc.c
+++ b/sound/soc/at91/at91-ssc.c
@@ -590,7 +590,7 @@ static int at91_ssc_hw_params(struct snd_pcm_substream *substream,
                         printk(KERN_WARNING "at91-ssc: request_irq failure\n");
 
                         DBG("Stopping pid %d clock\n", ssc_p->ssc.pid);
-                        at91_sys_write(AT91_PMC_PCER, 1<<ssc_p->ssc.pid);
+                        at91_sys_write(AT91_PMC_PCDR, 1<<ssc_p->ssc.pid);
                         return ret;
                 }