diff options
| author | Takashi Iwai <tiwai@suse.de> | 2008-02-22 18:34:06 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-22 14:20:08 -0800 |
| commit | 0ee46c9dadcbbd0daa12da30f226391896d90abb (patch) | |
| tree | 3483dd812fa0c724a1812bf6048dc6761a7fcfe6 /include/sound | |
| parent | 2c020a99e058cdfc3a073cbfbfcc6ff55d3bfc43 (diff) | |
| download | op-kernel-dev-0ee46c9dadcbbd0daa12da30f226391896d90abb.zip op-kernel-dev-0ee46c9dadcbbd0daa12da30f226391896d90abb.tar.gz | |
[ALSA] opl3 - Fix compilation without sequencer support
Add proper ifdef's to the patch loading code moved from the old instr
layer so that opl3 driver can be compiled without the sequencer support.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include/sound')
| -rw-r--r-- | include/sound/opl3.h | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/include/sound/opl3.h b/include/sound/opl3.h index a0c5feb..6ba6707 100644 --- a/include/sound/opl3.h +++ b/include/sound/opl3.h @@ -370,12 +370,13 @@ int snd_opl3_hwdep_new(struct snd_opl3 * opl3, int device, int seq_device, int snd_opl3_open(struct snd_hwdep * hw, struct file *file); int snd_opl3_ioctl(struct snd_hwdep * hw, struct file *file, unsigned int cmd, unsigned long arg); -long snd_opl3_write(struct snd_hwdep *hw, const char __user *buf, long count, - loff_t *offset); int snd_opl3_release(struct snd_hwdep * hw, struct file *file); void snd_opl3_reset(struct snd_opl3 * opl3); +#if defined(CONFIG_SND_SEQUENCER) || defined(CONFIG_SND_SEQUENCER_MODULE) +long snd_opl3_write(struct snd_hwdep *hw, const char __user *buf, long count, + loff_t *offset); int snd_opl3_load_patch(struct snd_opl3 *opl3, int prog, int bank, int type, const char *name, @@ -384,5 +385,9 @@ int snd_opl3_load_patch(struct snd_opl3 *opl3, struct fm_patch *snd_opl3_find_patch(struct snd_opl3 *opl3, int prog, int bank, int create_patch); void snd_opl3_clear_patches(struct snd_opl3 *opl3); +#else +#define snd_opl3_write NULL +static inline void snd_opl3_clear_patches(struct snd_opl3 *opl3) {} +#endif #endif /* __SOUND_OPL3_H */ |
