summaryrefslogtreecommitdiffstats
path: root/sound/pci/ymfpci/ymfpci.h
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2012-10-15 12:57:42 +0900
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-10-15 12:57:42 +0900
commit2570a3719cd748899d9e9e8407eb0d9027df2a94 (patch)
tree2eb2819e880060486d36665113e8da5c460383fc /sound/pci/ymfpci/ymfpci.h
parent6e87badd3f38e1a095d6e1b13828246c3e8486b5 (diff)
parent8a2ceac6617a67d8a1ee4bd255743d577bde311a (diff)
downloadtalos-obmc-linux-2570a3719cd748899d9e9e8407eb0d9027df2a94.tar.gz
talos-obmc-linux-2570a3719cd748899d9e9e8407eb0d9027df2a94.zip
Merge tag 'regmap/range' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap into asoc-wm2200
regmap: Range API changes A bunch of updates to the regmap range support, the most important ones being to rename "n_ranges" to "num_ranges" for consistency and to allow block writes to cross page boundaries, making things more transparent.
Diffstat (limited to 'sound/pci/ymfpci/ymfpci.h')
-rw-r--r--sound/pci/ymfpci/ymfpci.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/pci/ymfpci/ymfpci.h b/sound/pci/ymfpci/ymfpci.h
index bddc4052286b..4631a2348915 100644
--- a/sound/pci/ymfpci/ymfpci.h
+++ b/sound/pci/ymfpci/ymfpci.h
@@ -363,7 +363,7 @@ struct snd_ymfpci {
const struct firmware *dsp_microcode;
const struct firmware *controller_microcode;
-#ifdef CONFIG_PM
+#ifdef CONFIG_PM_SLEEP
u32 *saved_regs;
u32 saved_ydsxgr_mode;
u16 saved_dsxg_legacy;
OpenPOWER on IntegriCloud