summaryrefslogtreecommitdiffstats
path: root/sound/pci/hda/hda_local.h
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2007-10-19 08:13:40 +0200
committerJaroslav Kysela <perex@perex.cz>2007-10-23 08:04:35 +0200
commit35a1e0cce647737b88dac7ca526fc525d92b3fff (patch)
tree62212f4809ae1141de21df892295aea4e9dda98c /sound/pci/hda/hda_local.h
parentc8229c38c61b1acab1f3fc28275690da71907248 (diff)
downloadblackbird-obmc-linux-35a1e0cce647737b88dac7ca526fc525d92b3fff.tar.gz
blackbird-obmc-linux-35a1e0cce647737b88dac7ca526fc525d92b3fff.zip
[ALSA] hda-codec - Fix build without CONFIG_SND_HDA_GENERIC
Fixed the build error from patch_sigmatel.c when built without CONFIG_SND_HDA_GENERIC by defining a dummy function to return error. Also, clean up hda_codec.c by removing unneeded ifdefs (the compiler will optimize out). Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Jaroslav Kysela <perex@perex.cz>
Diffstat (limited to 'sound/pci/hda/hda_local.h')
-rw-r--r--sound/pci/hda/hda_local.h7
1 files changed, 7 insertions, 0 deletions
diff --git a/sound/pci/hda/hda_local.h b/sound/pci/hda/hda_local.h
index a79d0ed5469c..a708effdcdad 100644
--- a/sound/pci/hda/hda_local.h
+++ b/sound/pci/hda/hda_local.h
@@ -245,7 +245,14 @@ int snd_hda_multi_out_analog_cleanup(struct hda_codec *codec,
/*
* generic codec parser
*/
+#ifdef CONFIG_SND_HDA_GENERIC
int snd_hda_parse_generic_codec(struct hda_codec *codec);
+#else
+static inline int snd_hda_parse_generic_codec(struct hda_codec *codec)
+{
+ return -ENODEV;
+}
+#endif
/*
* generic proc interface
OpenPOWER on IntegriCloud