Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 724339d7 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'linus' of master.kernel.org:/pub/scm/linux/kernel/git/perex/alsa 

* 'linus' of master.kernel.org:/pub/scm/linux/kernel/git/perex/alsa:
  [ALSA] version 1.0.14rc2
  [ALSA] Fix a typo in __dev* changes in portman2x4.c
  [ALSA] Change AT91 PDC register defines for 2.6.20 kernel
  [ALSA] SoC codecs - fix Kconfig - depends -> depends on
  [ALSA] Fix __devinit and __devexit issues with sound drivers
  [ALSA] hda-codec - Patch for enabling LFE on more Dell laptops
  [ALSA] hda-codec - More fixes for Conexant HD Audio support
  [ALSA] usb-audio: add PCR-A PCM support
  [ALSA] emu10k1: fix typo
  [ALSA] usbaudio - remove urb->bandwidth reference
  [ALSA] ac97 - Fix silent output problem with Cx20551 codec
  [ALSA] hda-codec - Fix Oops with probing sigmatel codec chips
parents 414f827c ccf2c222

include/sound/emu10k1.h

+1 −1
Original line number Diff line number Diff line
@@ -628,7 +628,7 @@ 
#define FXWC_SPDIFLEFT          (1<<22)		/* 0x00400000 */

#define FXWC_SPDIFRIGHT         (1<<23)		/* 0x00800000 */



#define A_TBLSZ	`		0x43	/* Effects Tank Internal Table Size. Only low byte or register used */

#define A_TBLSZ			0x43	/* Effects Tank Internal Table Size. Only low byte or register used */



#define TCBS			0x44		/* Tank cache buffer size register			*/

#define TCBS_MASK		0x00000007	/* Tank cache buffer size field				*/

include/sound/version.h

+1 −1
Original line number Diff line number Diff line 
/* include/version.h.  Generated by alsa/ksync script.  */

#define CONFIG_SND_VERSION "1.0.14rc2"

#define CONFIG_SND_DATE " (Fri Feb 09 13:50:10 2007 UTC)"
 
#define CONFIG_SND_DATE " (Wed Feb 14 07:42:13 2007 UTC)"

sound/arm/pxa2xx-ac97.c

+3 −3
Original line number Diff line number Diff line
@@ -305,7 +305,7 @@ static int pxa2xx_ac97_resume(struct platform_device *dev) 
#define pxa2xx_ac97_resume	NULL

#endif



static int pxa2xx_ac97_probe(struct platform_device *dev)

static int __devinit pxa2xx_ac97_probe(struct platform_device *dev)

{

	struct snd_card *card;

	struct snd_ac97_bus *ac97_bus;
@@ -369,7 +369,7 @@ static int pxa2xx_ac97_probe(struct platform_device *dev) 
	return ret;

}



static int pxa2xx_ac97_remove(struct platform_device *dev)

static int __devexit pxa2xx_ac97_remove(struct platform_device *dev)

{

	struct snd_card *card = platform_get_drvdata(dev);
@@ -386,7 +386,7 @@ static int pxa2xx_ac97_remove(struct platform_device *dev) 


static struct platform_driver pxa2xx_ac97_driver = {

	.probe		= pxa2xx_ac97_probe,

	.remove		= pxa2xx_ac97_remove,

	.remove		= __devexit_p(pxa2xx_ac97_remove),

	.suspend	= pxa2xx_ac97_suspend,

	.resume		= pxa2xx_ac97_resume,

	.driver		= {

sound/drivers/dummy.c

+6 −5
Original line number Diff line number Diff line
@@ -423,7 +423,8 @@ static struct snd_pcm_ops snd_card_dummy_capture_ops = { 
	.pointer =		snd_card_dummy_pcm_pointer,

};



static int __init snd_card_dummy_pcm(struct snd_dummy *dummy, int device, int substreams)

static int __devinit snd_card_dummy_pcm(struct snd_dummy *dummy, int device,

					int substreams)

{

	struct snd_pcm *pcm;

	int err;
@@ -562,7 +563,7 @@ DUMMY_VOLUME("CD Volume", 0, MIXER_ADDR_CD), 
DUMMY_CAPSRC("CD Capture Switch", 0, MIXER_ADDR_CD)

};



static int __init snd_card_dummy_new_mixer(struct snd_dummy *dummy)

static int __devinit snd_card_dummy_new_mixer(struct snd_dummy *dummy)

{

	struct snd_card *card = dummy->card;

	unsigned int idx;
@@ -579,7 +580,7 @@ static int __init snd_card_dummy_new_mixer(struct snd_dummy *dummy) 
	return 0;

}



static int __init snd_dummy_probe(struct platform_device *devptr)

static int __devinit snd_dummy_probe(struct platform_device *devptr)

{

	struct snd_card *card;

	struct snd_dummy *dummy;
@@ -617,7 +618,7 @@ static int __init snd_dummy_probe(struct platform_device *devptr) 
	return err;

}



static int snd_dummy_remove(struct platform_device *devptr)

static int __devexit snd_dummy_remove(struct platform_device *devptr)

{

	snd_card_free(platform_get_drvdata(devptr));

	platform_set_drvdata(devptr, NULL);
@@ -648,7 +649,7 @@ static int snd_dummy_resume(struct platform_device *pdev) 


static struct platform_driver snd_dummy_driver = {

	.probe		= snd_dummy_probe,

	.remove		= snd_dummy_remove,

	.remove		= __devexit_p(snd_dummy_remove),

#ifdef CONFIG_PM

	.suspend	= snd_dummy_suspend,

	.resume		= snd_dummy_resume,

sound/drivers/mtpav.c

+6 −6
Original line number Diff line number Diff line
@@ -583,7 +583,7 @@ static irqreturn_t snd_mtpav_irqh(int irq, void *dev_id) 
/*

 * get ISA resources

 */

static int __init snd_mtpav_get_ISA(struct mtpav * mcard)

static int __devinit snd_mtpav_get_ISA(struct mtpav * mcard)

{

	if ((mcard->res_port = request_region(port, 3, "MotuMTPAV MIDI")) == NULL) {

		snd_printk("MTVAP port 0x%lx is busy\n", port);
@@ -619,7 +619,7 @@ static struct snd_rawmidi_ops snd_mtpav_input = { 
 * get RAWMIDI resources

 */



static void __init snd_mtpav_set_name(struct mtpav *chip,

static void __devinit snd_mtpav_set_name(struct mtpav *chip,

				      struct snd_rawmidi_substream *substream)

{

	if (substream->number >= 0 && substream->number < chip->num_ports)
@@ -634,7 +634,7 @@ static void __init snd_mtpav_set_name(struct mtpav *chip, 
		strcpy(substream->name, "MTP broadcast");

}



static int __init snd_mtpav_get_RAWMIDI(struct mtpav *mcard)

static int __devinit snd_mtpav_get_RAWMIDI(struct mtpav *mcard)

{

	int rval;

	struct snd_rawmidi *rawmidi;
@@ -691,7 +691,7 @@ static void snd_mtpav_free(struct snd_card *card) 


/*

 */

static int __init snd_mtpav_probe(struct platform_device *dev)

static int __devinit snd_mtpav_probe(struct platform_device *dev)

{

	struct snd_card *card;

	int err;
@@ -745,7 +745,7 @@ static int __init snd_mtpav_probe(struct platform_device *dev) 
	return err;

}



static int snd_mtpav_remove(struct platform_device *devptr)

static int __devexit snd_mtpav_remove(struct platform_device *devptr)

{

	snd_card_free(platform_get_drvdata(devptr));

	platform_set_drvdata(devptr, NULL);
@@ -756,7 +756,7 @@ static int snd_mtpav_remove(struct platform_device *devptr) 


static struct platform_driver snd_mtpav_driver = {

	.probe		= snd_mtpav_probe,

	.remove		= snd_mtpav_remove,

	.remove		= __devexit_p(snd_mtpav_remove),

	.driver		= {

		.name	= SND_MTPAV_DRIVER

	},