diff options
| author | Takashi Iwai <tiwai@suse.de> | 2013-01-23 14:44:11 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2013-01-23 14:44:11 +0100 |
| commit | 04769b96ce3e816e1b0716c411d68d96dfa7b559 (patch) | |
| tree | 0e9ccec30376859736681bb95e6bf23a01f88ea1 | |
| parent | 514191f06aaf2242b5890d0dade9e2e450951e26 (diff) | |
| download | hda-emu-04769b96ce3e816e1b0716c411d68d96dfa7b559.tar.gz | |
Fix again build breakage by the previous commit
patch_hdmi.c _is_ compiled in the recent kernels, of course.
So the real fix is to compile patch_hdmi.c only when patch_atihdmi.c &
co don't exist.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | kernel/Makefile.am | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac index 3440e01..c7172cc 100644 --- a/configure.ac +++ b/configure.ac @@ -91,6 +91,7 @@ CHECK_CODEC(cmedia, CONFIG_SND_HDA_CODEC_CMEDIA) CHECK_CODEC(conexant, CONFIG_SND_HDA_CODEC_CONEXANT) CHECK_CODEC(intelhdmi, CONFIG_SND_HDA_CODEC_INTELHDMI) CHECK_CODEC(nvhdmi, CONFIG_SND_HDA_CODEC_NVHDMI) +CHECK_CODEC(hdmi, CONFIG_SND_HDA_CODEC_HDMI) CHECK_CODEC(realtek, CONFIG_SND_HDA_CODEC_REALTEK) CHECK_CODEC(sigmatel, CONFIG_SND_HDA_CODEC_SIGMATEL) CHECK_CODEC(si3054, CONFIG_SND_HDA_CODEC_SI3054) diff --git a/kernel/Makefile.am b/kernel/Makefile.am index 5d4fe01..3880d07 100644 --- a/kernel/Makefile.am +++ b/kernel/Makefile.am @@ -31,6 +31,10 @@ PATCHES += patch_cirrus.c endif if CONFIG_SND_HDA_CODEC_ATIHDMI PATCHES += patch_atihdmi.c +else +if CONFIG_SND_HDA_CODEC_HDMI +PATCHES += patch_hdmi.c +endif endif if CONFIG_SND_HDA_CODEC_INTELHDMI PATCHES += patch_intelhdmi.c |