diff options
| -rw-r--r-- | sound/pci/hda/Makefile | 6 | ||||
| -rw-r--r-- | sound/pci/hda/hda_eld.c | 6 |
2 files changed, 9 insertions, 3 deletions
diff --git a/sound/pci/hda/Makefile b/sound/pci/hda/Makefile index 199f4405b3ad..24bc195b02da 100644 --- a/sound/pci/hda/Makefile +++ b/sound/pci/hda/Makefile | |||
| @@ -3,7 +3,7 @@ snd-hda-intel-objs := hda_intel.o | |||
| 3 | snd-hda-codec-y := hda_codec.o | 3 | snd-hda-codec-y := hda_codec.o |
| 4 | snd-hda-codec-$(CONFIG_SND_HDA_GENERIC) += hda_generic.o | 4 | snd-hda-codec-$(CONFIG_SND_HDA_GENERIC) += hda_generic.o |
| 5 | snd-hda-codec-$(CONFIG_PROC_FS) += hda_proc.o | 5 | snd-hda-codec-$(CONFIG_PROC_FS) += hda_proc.o |
| 6 | # snd-hda-codec-$(CONFIG_SND_HDA_ELD) += hda_eld.o | 6 | snd-hda-codec-$(CONFIG_SND_HDA_ELD) += hda_eld.o |
| 7 | snd-hda-codec-$(CONFIG_SND_HDA_HWDEP) += hda_hwdep.o | 7 | snd-hda-codec-$(CONFIG_SND_HDA_HWDEP) += hda_hwdep.o |
| 8 | snd-hda-codec-$(CONFIG_SND_HDA_INPUT_BEEP) += hda_beep.o | 8 | snd-hda-codec-$(CONFIG_SND_HDA_INPUT_BEEP) += hda_beep.o |
| 9 | 9 | ||
| @@ -17,8 +17,8 @@ snd-hda-codec-cirrus-objs := patch_cirrus.o | |||
| 17 | snd-hda-codec-ca0110-objs := patch_ca0110.o | 17 | snd-hda-codec-ca0110-objs := patch_ca0110.o |
| 18 | snd-hda-codec-conexant-objs := patch_conexant.o | 18 | snd-hda-codec-conexant-objs := patch_conexant.o |
| 19 | snd-hda-codec-via-objs := patch_via.o | 19 | snd-hda-codec-via-objs := patch_via.o |
| 20 | snd-hda-codec-nvhdmi-objs := patch_nvhdmi.o hda_eld.o | 20 | snd-hda-codec-nvhdmi-objs := patch_nvhdmi.o |
| 21 | snd-hda-codec-intelhdmi-objs := patch_intelhdmi.o hda_eld.o | 21 | snd-hda-codec-intelhdmi-objs := patch_intelhdmi.o |
| 22 | 22 | ||
| 23 | # common driver | 23 | # common driver |
| 24 | obj-$(CONFIG_SND_HDA_INTEL) := snd-hda-codec.o | 24 | obj-$(CONFIG_SND_HDA_INTEL) := snd-hda-codec.o |
diff --git a/sound/pci/hda/hda_eld.c b/sound/pci/hda/hda_eld.c index 4228f2fe5956..dcd22446cfc7 100644 --- a/sound/pci/hda/hda_eld.c +++ b/sound/pci/hda/hda_eld.c | |||
| @@ -331,6 +331,7 @@ int snd_hdmi_get_eld_size(struct hda_codec *codec, hda_nid_t nid) | |||
| 331 | return snd_hda_codec_read(codec, nid, 0, AC_VERB_GET_HDMI_DIP_SIZE, | 331 | return snd_hda_codec_read(codec, nid, 0, AC_VERB_GET_HDMI_DIP_SIZE, |
| 332 | AC_DIPSIZE_ELD_BUF); | 332 | AC_DIPSIZE_ELD_BUF); |
| 333 | } | 333 | } |
| 334 | EXPORT_SYMBOL_HDA(snd_hdmi_get_eld_size); | ||
| 334 | 335 | ||
| 335 | int snd_hdmi_get_eld(struct hdmi_eld *eld, | 336 | int snd_hdmi_get_eld(struct hdmi_eld *eld, |
| 336 | struct hda_codec *codec, hda_nid_t nid) | 337 | struct hda_codec *codec, hda_nid_t nid) |
| @@ -366,6 +367,7 @@ int snd_hdmi_get_eld(struct hdmi_eld *eld, | |||
| 366 | kfree(buf); | 367 | kfree(buf); |
| 367 | return ret; | 368 | return ret; |
| 368 | } | 369 | } |
| 370 | EXPORT_SYMBOL_HDA(snd_hdmi_get_eld); | ||
| 369 | 371 | ||
| 370 | static void hdmi_show_short_audio_desc(struct cea_sad *a) | 372 | static void hdmi_show_short_audio_desc(struct cea_sad *a) |
| 371 | { | 373 | { |
| @@ -404,6 +406,7 @@ void snd_print_channel_allocation(int spk_alloc, char *buf, int buflen) | |||
| 404 | } | 406 | } |
| 405 | buf[j] = '\0'; /* necessary when j == 0 */ | 407 | buf[j] = '\0'; /* necessary when j == 0 */ |
| 406 | } | 408 | } |
| 409 | EXPORT_SYMBOL_HDA(snd_print_channel_allocation); | ||
| 407 | 410 | ||
| 408 | void snd_hdmi_show_eld(struct hdmi_eld *e) | 411 | void snd_hdmi_show_eld(struct hdmi_eld *e) |
| 409 | { | 412 | { |
| @@ -422,6 +425,7 @@ void snd_hdmi_show_eld(struct hdmi_eld *e) | |||
| 422 | for (i = 0; i < e->sad_count; i++) | 425 | for (i = 0; i < e->sad_count; i++) |
| 423 | hdmi_show_short_audio_desc(e->sad + i); | 426 | hdmi_show_short_audio_desc(e->sad + i); |
| 424 | } | 427 | } |
| 428 | EXPORT_SYMBOL_HDA(snd_hdmi_show_eld); | ||
| 425 | 429 | ||
| 426 | #ifdef CONFIG_PROC_FS | 430 | #ifdef CONFIG_PROC_FS |
| 427 | 431 | ||
| @@ -580,6 +584,7 @@ int snd_hda_eld_proc_new(struct hda_codec *codec, struct hdmi_eld *eld, | |||
| 580 | 584 | ||
| 581 | return 0; | 585 | return 0; |
| 582 | } | 586 | } |
| 587 | EXPORT_SYMBOL_HDA(snd_hda_eld_proc_new); | ||
| 583 | 588 | ||
| 584 | void snd_hda_eld_proc_free(struct hda_codec *codec, struct hdmi_eld *eld) | 589 | void snd_hda_eld_proc_free(struct hda_codec *codec, struct hdmi_eld *eld) |
| 585 | { | 590 | { |
| @@ -588,5 +593,6 @@ void snd_hda_eld_proc_free(struct hda_codec *codec, struct hdmi_eld *eld) | |||
| 588 | eld->proc_entry = NULL; | 593 | eld->proc_entry = NULL; |
| 589 | } | 594 | } |
| 590 | } | 595 | } |
| 596 | EXPORT_SYMBOL_HDA(snd_hda_eld_proc_free); | ||
| 591 | 597 | ||
| 592 | #endif /* CONFIG_PROC_FS */ | 598 | #endif /* CONFIG_PROC_FS */ |
