diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-10-15 12:57:42 +0900 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-10-15 12:57:42 +0900 |
| commit | 2570a3719cd748899d9e9e8407eb0d9027df2a94 (patch) | |
| tree | 2eb2819e880060486d36665113e8da5c460383fc /sound/pci/ice1712/juli.c | |
| parent | 6e87badd3f38e1a095d6e1b13828246c3e8486b5 (diff) | |
| parent | 8a2ceac6617a67d8a1ee4bd255743d577bde311a (diff) | |
| download | talos-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/ice1712/juli.c')
| -rw-r--r-- | sound/pci/ice1712/juli.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/pci/ice1712/juli.c b/sound/pci/ice1712/juli.c index 98bc3b7681b5..14fd536b6452 100644 --- a/sound/pci/ice1712/juli.c +++ b/sound/pci/ice1712/juli.c @@ -486,7 +486,7 @@ static int __devinit juli_add_controls(struct snd_ice1712 *ice) * suspend/resume * */ -#ifdef CONFIG_PM +#ifdef CONFIG_PM_SLEEP static int juli_resume(struct snd_ice1712 *ice) { struct snd_akm4xxx *ak = ice->akm; @@ -652,7 +652,7 @@ static int __devinit juli_init(struct snd_ice1712 *ice) ice->spdif.ops.open = juli_spdif_in_open; -#ifdef CONFIG_PM +#ifdef CONFIG_PM_SLEEP ice->pm_resume = juli_resume; ice->pm_suspend = juli_suspend; ice->pm_suspend_enabled = 1; |
