diff options
| author | Kumar Gala <galak@kernel.crashing.org> | 2006-04-04 23:10:34 +0200 |
|---|---|---|
| committer | Kumar Gala <galak@kernel.crashing.org> | 2006-04-04 23:10:34 +0200 |
| commit | 12df7556705aae97f24a397377e17898700d7192 (patch) | |
| tree | 5adc6b1c2aa940263ee2e88fc6645918533da539 /include/sound/core.h | |
| parent | powerpc/ppc: export strncasecmp (diff) | |
| parent | Linux v2.6.17-rc1 (diff) | |
| download | linux-12df7556705aae97f24a397377e17898700d7192.tar.xz linux-12df7556705aae97f24a397377e17898700d7192.zip | |
Merge branch 'master'
Diffstat (limited to 'include/sound/core.h')
| -rw-r--r-- | include/sound/core.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/sound/core.h b/include/sound/core.h index 7f32c12b4a0a..5135147f20e8 100644 --- a/include/sound/core.h +++ b/include/sound/core.h @@ -170,13 +170,13 @@ static inline void snd_power_change_state(struct snd_card *card, unsigned int st } /* init.c */ -int snd_power_wait(struct snd_card *card, unsigned int power_state, struct file *file); +int snd_power_wait(struct snd_card *card, unsigned int power_state); #else /* ! CONFIG_PM */ #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) |