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

Commit 44c76a96 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge branch 'topic/misc' into for-linus

parents dbf117cb c6b76d1f

include/sound/pcm.h

+3 −2
Original line number Diff line number Diff line
@@ -264,7 +264,7 @@ struct snd_pcm_hw_constraint_ratdens { 


struct snd_pcm_hw_constraint_list {

	unsigned int count;

	unsigned int *list;

	const unsigned int *list;

	unsigned int mask;

};
@@ -781,7 +781,8 @@ void snd_interval_muldivk(const struct snd_interval *a, const struct snd_interva 
			  unsigned int k, struct snd_interval *c);

void snd_interval_mulkdiv(const struct snd_interval *a, unsigned int k,

			  const struct snd_interval *b, struct snd_interval *c);

int snd_interval_list(struct snd_interval *i, unsigned int count, unsigned int *list, unsigned int mask);

int snd_interval_list(struct snd_interval *i, unsigned int count,

		      const unsigned int *list, unsigned int mask);

int snd_interval_ratnum(struct snd_interval *i,

			unsigned int rats_count, struct snd_ratnum *rats,

			unsigned int *nump, unsigned int *denp);

include/sound/version.h

+1 −1
Original line number Diff line number Diff line 
/* include/version.h */

#define CONFIG_SND_VERSION "1.0.24"

#define CONFIG_SND_VERSION "1.0.25"

#define CONFIG_SND_DATE ""

include/sound/ymfpci.h

+2 −0
Original line number Diff line number Diff line
@@ -366,6 +366,8 @@ struct snd_ymfpci { 
#ifdef CONFIG_PM

	u32 *saved_regs;

	u32 saved_ydsxgr_mode;

	u16 saved_dsxg_legacy;

	u16 saved_dsxg_elegacy;

#endif

};

sound/aoa/codecs/onyx.c

+1 −12
Original line number Diff line number Diff line
@@ -1132,15 +1132,4 @@ static struct i2c_driver onyx_driver = { 
	.id_table = onyx_i2c_id,

};



static int __init onyx_init(void)

{

	return i2c_add_driver(&onyx_driver);

}



static void __exit onyx_exit(void)

{

	i2c_del_driver(&onyx_driver);

}



module_init(onyx_init);

module_exit(onyx_exit);
 
module_i2c_driver(onyx_driver);

sound/aoa/codecs/tas.c

+1 −12
Original line number Diff line number Diff line
@@ -1026,15 +1026,4 @@ static struct i2c_driver tas_driver = { 
	.id_table = tas_i2c_id,

};



static int __init tas_init(void)

{

	return i2c_add_driver(&tas_driver);

}



static void __exit tas_exit(void)

{

	i2c_del_driver(&tas_driver);

}



module_init(tas_init);

module_exit(tas_exit);
 
module_i2c_driver(tas_driver);