diff options
-rw-r--r-- | sound/pci/Makefile | 2 | ||||
-rw-r--r-- | sound/pci/ac97/Makefile | 3 | ||||
-rw-r--r-- | sound/pci/ak4531_codec.c (renamed from sound/pci/ac97/ak4531_codec.c) | 32 |
3 files changed, 7 insertions, 30 deletions
diff --git a/sound/pci/Makefile b/sound/pci/Makefile index 85ef14bc8056..65b25d221cd2 100644 --- a/sound/pci/Makefile +++ b/sound/pci/Makefile | |||
@@ -13,7 +13,7 @@ snd-bt87x-objs := bt87x.o | |||
13 | snd-cmipci-objs := cmipci.o | 13 | snd-cmipci-objs := cmipci.o |
14 | snd-cs4281-objs := cs4281.o | 14 | snd-cs4281-objs := cs4281.o |
15 | snd-cs5530-objs := cs5530.o | 15 | snd-cs5530-objs := cs5530.o |
16 | snd-ens1370-objs := ens1370.o | 16 | snd-ens1370-objs := ens1370.o ak4531_codec.o |
17 | snd-ens1371-objs := ens1371.o | 17 | snd-ens1371-objs := ens1371.o |
18 | snd-es1938-objs := es1938.o | 18 | snd-es1938-objs := es1938.o |
19 | snd-es1968-objs := es1968.o | 19 | snd-es1968-objs := es1968.o |
diff --git a/sound/pci/ac97/Makefile b/sound/pci/ac97/Makefile index ae36950f2568..41fa322f0971 100644 --- a/sound/pci/ac97/Makefile +++ b/sound/pci/ac97/Makefile | |||
@@ -6,8 +6,5 @@ | |||
6 | snd-ac97-codec-y := ac97_codec.o ac97_pcm.o | 6 | snd-ac97-codec-y := ac97_codec.o ac97_pcm.o |
7 | snd-ac97-codec-$(CONFIG_PROC_FS) += ac97_proc.o | 7 | snd-ac97-codec-$(CONFIG_PROC_FS) += ac97_proc.o |
8 | 8 | ||
9 | snd-ak4531-codec-objs := ak4531_codec.o | ||
10 | |||
11 | # Toplevel Module Dependency | 9 | # Toplevel Module Dependency |
12 | obj-$(CONFIG_SND_AC97_CODEC) += snd-ac97-codec.o | 10 | obj-$(CONFIG_SND_AC97_CODEC) += snd-ac97-codec.o |
13 | obj-$(CONFIG_SND_ENS1370) += snd-ak4531-codec.o | ||
diff --git a/sound/pci/ac97/ak4531_codec.c b/sound/pci/ak4531_codec.c index c0c1633999ea..6a99eed2d8b6 100644 --- a/sound/pci/ac97/ak4531_codec.c +++ b/sound/pci/ak4531_codec.c | |||
@@ -270,7 +270,7 @@ static const DECLARE_TLV_DB_SCALE(db_scale_master, -6200, 200, 0); | |||
270 | static const DECLARE_TLV_DB_SCALE(db_scale_mono, -2800, 400, 0); | 270 | static const DECLARE_TLV_DB_SCALE(db_scale_mono, -2800, 400, 0); |
271 | static const DECLARE_TLV_DB_SCALE(db_scale_input, -5000, 200, 0); | 271 | static const DECLARE_TLV_DB_SCALE(db_scale_input, -5000, 200, 0); |
272 | 272 | ||
273 | static struct snd_kcontrol_new snd_ak4531_controls[] = { | 273 | static struct snd_kcontrol_new snd_ak4531_controls[] __devinitdata = { |
274 | 274 | ||
275 | AK4531_DOUBLE_TLV("Master Playback Switch", 0, | 275 | AK4531_DOUBLE_TLV("Master Playback Switch", 0, |
276 | AK4531_LMASTER, AK4531_RMASTER, 7, 7, 1, 1, | 276 | AK4531_LMASTER, AK4531_RMASTER, 7, 7, 1, 1, |
@@ -379,8 +379,9 @@ static u8 snd_ak4531_initial_map[0x19 + 1] = { | |||
379 | 0x01 /* 19: Mic Amp Setup */ | 379 | 0x01 /* 19: Mic Amp Setup */ |
380 | }; | 380 | }; |
381 | 381 | ||
382 | int snd_ak4531_mixer(struct snd_card *card, struct snd_ak4531 *_ak4531, | 382 | int __devinit snd_ak4531_mixer(struct snd_card *card, |
383 | struct snd_ak4531 **rak4531) | 383 | struct snd_ak4531 *_ak4531, |
384 | struct snd_ak4531 **rak4531) | ||
384 | { | 385 | { |
385 | unsigned int idx; | 386 | unsigned int idx; |
386 | int err; | 387 | int err; |
@@ -476,7 +477,8 @@ static void snd_ak4531_proc_read(struct snd_info_entry *entry, | |||
476 | ak4531->regs[AK4531_MIC_GAIN] & 1 ? "+30dB" : "+0dB"); | 477 | ak4531->regs[AK4531_MIC_GAIN] & 1 ? "+30dB" : "+0dB"); |
477 | } | 478 | } |
478 | 479 | ||
479 | static void snd_ak4531_proc_init(struct snd_card *card, struct snd_ak4531 *ak4531) | 480 | static void __devinit |
481 | snd_ak4531_proc_init(struct snd_card *card, struct snd_ak4531 *ak4531) | ||
480 | { | 482 | { |
481 | struct snd_info_entry *entry; | 483 | struct snd_info_entry *entry; |
482 | 484 | ||
@@ -484,25 +486,3 @@ static void snd_ak4531_proc_init(struct snd_card *card, struct snd_ak4531 *ak453 | |||
484 | snd_info_set_text_ops(entry, ak4531, snd_ak4531_proc_read); | 486 | snd_info_set_text_ops(entry, ak4531, snd_ak4531_proc_read); |
485 | } | 487 | } |
486 | #endif | 488 | #endif |
487 | |||
488 | EXPORT_SYMBOL(snd_ak4531_mixer); | ||
489 | #ifdef CONFIG_PM | ||
490 | EXPORT_SYMBOL(snd_ak4531_suspend); | ||
491 | EXPORT_SYMBOL(snd_ak4531_resume); | ||
492 | #endif | ||
493 | |||
494 | /* | ||
495 | * INIT part | ||
496 | */ | ||
497 | |||
498 | static int __init alsa_ak4531_init(void) | ||
499 | { | ||
500 | return 0; | ||
501 | } | ||
502 | |||
503 | static void __exit alsa_ak4531_exit(void) | ||
504 | { | ||
505 | } | ||
506 | |||
507 | module_init(alsa_ak4531_init) | ||
508 | module_exit(alsa_ak4531_exit) | ||