Commit f5892745 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 625fc3a3 e3a2efa6

arch/x86/kernel/Makefile

+1 −3
Original line number Diff line number Diff line
@@ -83,9 +83,7 @@ obj-$(CONFIG_KVM_GUEST) += kvm.o 
obj-$(CONFIG_KVM_CLOCK)		+= kvmclock.o

obj-$(CONFIG_PARAVIRT)		+= paravirt.o paravirt_patch_$(BITS).o



ifdef CONFIG_INPUT_PCSPKR

obj-y				+= pcspeaker.o

endif

obj-$(CONFIG_PCSPKR_PLATFORM)	+= pcspeaker.o



obj-$(CONFIG_SCx200)		+= scx200.o

scx200-y			+= scx200_32.o

drivers/input/misc/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ if INPUT_MISC 


config INPUT_PCSPKR

	tristate "PC Speaker support"

	depends on ALPHA || X86 || MIPS || PPC_PREP || PPC_CHRP || PPC_PSERIES

	depends on PCSPKR_PLATFORM

	depends on SND_PCSP=n

	help

	  Say Y here if you want the standard PC Speaker to be used for

init/Kconfig

+8 −0
Original line number Diff line number Diff line
@@ -634,6 +634,14 @@ config ELF_CORE 
	help

	  Enable support for generating core dumps. Disabling saves about 4k.



config PCSPKR_PLATFORM

	bool "Enable PC-Speaker support" if EMBEDDED

	depends on ALPHA || X86 || MIPS || PPC_PREP || PPC_CHRP || PPC_PSERIES

	default y

	help

          This option allows to disable the internal PC-Speaker

          support, saving some memory.



config COMPAT_BRK

	bool "Disable heap randomization"

	default y

sound/drivers/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -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

sound/soc/at91/at91-pcm.c

+7 −4
Original line number Diff line number Diff line
@@ -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: