diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-08-13 13:50:07 +0000 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-08-13 13:50:07 +0000 |
| commit | 88675606cd3093c248c9600f3ddb153d660cbc6e (patch) | |
| tree | d1bcab1cd891d3770c3f859317de1aa471f76304 /sound | |
| parent | 57c6e9f71d7053953edaa13260e805008d90c4cb (diff) | |
| parent | 82e96b5d095a384e3e0816830aa9088d5ec0e862 (diff) | |
Merge branch 'warnings/fixed-elsewhere' into testing/defconfig-warnings
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/drivers/dummy.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/drivers/dummy.c b/sound/drivers/dummy.c index f7d3bfc6bca8..54bb6644a598 100644 --- a/sound/drivers/dummy.c +++ b/sound/drivers/dummy.c @@ -1064,7 +1064,7 @@ static int __devexit snd_dummy_remove(struct platform_device *devptr) return 0; } -#ifdef CONFIG_PM +#ifdef CONFIG_PM_SLEEP static int snd_dummy_suspend(struct device *pdev) { struct snd_card *card = dev_get_drvdata(pdev); |