]> err.no Git - linux-2.6/commitdiff
Update dummy snd_power_wait() function for new calling convention
authorLinus Torvalds <torvalds@g5.osdl.org>
Sun, 2 Apr 2006 21:37:36 +0000 (14:37 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Sun, 2 Apr 2006 21:37:36 +0000 (14:37 -0700)
Apparently nobody had tried to compile the ALSA CVS tree without power
management enabled.

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
include/sound/core.h

index d1d043f6cb80c3306dc950f3103131d2ef52871b..5135147f20e89db0413eff0c1ee99dea305af0be 100644 (file)
@@ -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)