summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorTakashi Iwai2009-11-12 10:01:18 +0100
committerTakashi Iwai2009-11-12 10:01:18 +0100
commit7288561af9a931c59e431336b553d897ee37b67d (patch)
treea4880bbe8e17f443f7cd2ad642e76788ef3ead07 /sound
parentALSA: hda - Don't access invalid substream in proc file (diff)
downloadkernel-qcow2-linux-7288561af9a931c59e431336b553d897ee37b67d.tar.gz
kernel-qcow2-linux-7288561af9a931c59e431336b553d897ee37b67d.tar.xz
kernel-qcow2-linux-7288561af9a931c59e431336b553d897ee37b67d.zip
ALSA: hda - Fix build error without CONFIG_SND_HDA_HWDEP=y
CONFIG_SND_HDA_POWER_SAVE is independent from CONFIG_SND_HDA_HWDEP. Thus snd_hda_hwdep_add_power_sysfs() needs the check of both kconfigs. Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound')
-rw-r--r--sound/pci/hda/hda_local.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/pci/hda/hda_local.h b/sound/pci/hda/hda_local.h
index 015fbac914b3..c1ca3182e6a4 100644
--- a/sound/pci/hda/hda_local.h
+++ b/sound/pci/hda/hda_local.h
@@ -437,7 +437,7 @@ int snd_hda_create_hwdep(struct hda_codec *codec);
static inline int snd_hda_create_hwdep(struct hda_codec *codec) { return 0; }
#endif
-#ifdef CONFIG_SND_HDA_POWER_SAVE
+#if defined(CONFIG_SND_HDA_POWER_SAVE) && defined(CONFIG_SND_HDA_HWDEP)
int snd_hda_hwdep_add_power_sysfs(struct hda_codec *codec);
#else
static inline int snd_hda_hwdep_add_power_sysfs(struct hda_codec *codec)