diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-04-02 23:37:36 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-04-02 23:37:36 +0200 |
| commit | 6fdb94bd95dc7a2effcbffa7a1d9e792cade57b6 (patch) | |
| tree | c3edc2ef4fc13bc0ec39e0577c61c84fd9a7e5ce | |
| parent | Merge branch 'splice' of git://brick.kernel.dk/data/git/linux-2.6-block (diff) | |
| download | linux-6fdb94bd95dc7a2effcbffa7a1d9e792cade57b6.tar.xz linux-6fdb94bd95dc7a2effcbffa7a1d9e792cade57b6.zip | |
Update dummy snd_power_wait() function for new calling convention
Apparently nobody had tried to compile the ALSA CVS tree without power
management enabled.
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| -rw-r--r-- | include/sound/core.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/sound/core.h b/include/sound/core.h index d1d043f6cb80..5135147f20e8 100644 --- a/include/sound/core.h +++ b/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) |