diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-09-05 01:04:34 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-09-05 01:04:34 -0400 |
| commit | fc600432cd23e35c85de2ff4468d816d6938a112 (patch) | |
| tree | c191c51e4458ec31c1d8254f01e23b2e1574b6f4 /sound/drivers/aloop.c | |
| parent | db61550931957ee6c7dba751662919424b4344f3 (diff) | |
| parent | 4cbe5a555fa58a79b6ecbb6c531b8bab0650778d (diff) | |
Merge tag 'v3.6-rc4' into asoc-omap
Linux 3.6-rc4
Diffstat (limited to 'sound/drivers/aloop.c')
| -rw-r--r-- | sound/drivers/aloop.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/drivers/aloop.c b/sound/drivers/aloop.c index 1128b35b2b05..5a34355e78e8 100644 --- a/sound/drivers/aloop.c +++ b/sound/drivers/aloop.c | |||
| @@ -1176,7 +1176,7 @@ static int __devexit loopback_remove(struct platform_device *devptr) | |||
| 1176 | return 0; | 1176 | return 0; |
| 1177 | } | 1177 | } |
| 1178 | 1178 | ||
| 1179 | #ifdef CONFIG_PM | 1179 | #ifdef CONFIG_PM_SLEEP |
| 1180 | static int loopback_suspend(struct device *pdev) | 1180 | static int loopback_suspend(struct device *pdev) |
| 1181 | { | 1181 | { |
| 1182 | struct snd_card *card = dev_get_drvdata(pdev); | 1182 | struct snd_card *card = dev_get_drvdata(pdev); |