From e1509ac1db647bc20126ba00df2111ce3da459a5 Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Sun, 2 Apr 2006 14:37:36 -0700 Subject: [PATCH] --- yaml --- r: 25316 b: refs/heads/master c: 6fdb94bd95dc7a2effcbffa7a1d9e792cade57b6 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/include/sound/core.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 953003999afd..6e580f6935fa 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d69636157ad8fa6bb9fff452cefb34fcace851b5 +refs/heads/master: 6fdb94bd95dc7a2effcbffa7a1d9e792cade57b6 diff --git a/trunk/include/sound/core.h b/trunk/include/sound/core.h index d1d043f6cb80..5135147f20e8 100644 --- a/trunk/include/sound/core.h +++ b/trunk/include/sound/core.h @@ -176,7 +176,7 @@ int snd_power_wait(struct snd_card *card, unsigned int power_state); #define snd_power_lock(card) do { (void)(card); } while (0) #define snd_power_unlock(card) do { (void)(card); } while (0) -static inline int snd_power_wait(struct snd_card *card, unsigned int state, struct file *file) { return 0; } +static inline int snd_power_wait(struct snd_card *card, unsigned int state) { return 0; } #define snd_power_get_state(card) SNDRV_CTL_POWER_D0 #define snd_power_change_state(card, state) do { (void)(card); } while (0)