From: Arnd Bergmann Date: Mon, 26 May 2014 19:15:20 +0000 (+0200) Subject: ALSA: hda: fix tegra build X-Git-Tag: omap-for-v3.16/fixes-against-rc1~21^2~42 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=16c2395203c30046cb9df43c2c28a7a968e449ac;p=pandora-kernel.git ALSA: hda: fix tegra build When CONFIG_PM is disabled, the CONFIG_SND_HDA_POWER_SAVE_DEFAULT symbol does not get defined, which causes a build error for the hda-tegra driver: hda/hda_tegra.c:80:25: error: 'CONFIG_SND_HDA_POWER_SAVE_DEFAULT' undeclared here (not in a function) static int power_save = CONFIG_SND_HDA_POWER_SAVE_DEFAULT; ^ /git/arm-soc/sound/pci/hda/hda_tegra.c:235:13: warning: 'hda_tegra_disable_clocks' defined but not used [-Wunused-function] static void hda_tegra_disable_clocks(struct hda_tegra *data) ^ This works around the problem by not referencing that macro when CONFIG_PM is disabled. Instead, we assume that it's disabled unconditionally and cannot be enabled at runtime. Signed-off-by: Arnd Bergmann Cc: Dylan Reid Cc: Stephen Warren Signed-off-by: Takashi Iwai --- Reading git-diff-tree failed