Commit 51003cdf authored by Jaroslav Kysela's avatar Jaroslav Kysela

ALSA CVS update - Takashi Iwai <tiwai@suse.de>

OPL3,Raw OPL FM,ES1968 driver
removed obsolete __SND_OSS_COMPAT__.
parent 7f034787
...@@ -105,8 +105,6 @@ typedef struct snd_dm_fm_params { ...@@ -105,8 +105,6 @@ typedef struct snd_dm_fm_params {
/* for OPL3 only */ /* for OPL3 only */
#define SNDRV_DM_FM_IOCTL_SET_CONNECTION _IOW('H', 0x26, int) #define SNDRV_DM_FM_IOCTL_SET_CONNECTION _IOW('H', 0x26, int)
#ifdef __SND_OSS_COMPAT__
#define SNDRV_DM_FM_OSS_IOCTL_RESET 0x20 #define SNDRV_DM_FM_OSS_IOCTL_RESET 0x20
#define SNDRV_DM_FM_OSS_IOCTL_PLAY_NOTE 0x21 #define SNDRV_DM_FM_OSS_IOCTL_PLAY_NOTE 0x21
#define SNDRV_DM_FM_OSS_IOCTL_SET_VOICE 0x22 #define SNDRV_DM_FM_OSS_IOCTL_SET_VOICE 0x22
...@@ -114,6 +112,4 @@ typedef struct snd_dm_fm_params { ...@@ -114,6 +112,4 @@ typedef struct snd_dm_fm_params {
#define SNDRV_DM_FM_OSS_IOCTL_SET_MODE 0x24 #define SNDRV_DM_FM_OSS_IOCTL_SET_MODE 0x24
#define SNDRV_DM_FM_OSS_IOCTL_SET_OPL 0x25 #define SNDRV_DM_FM_OSS_IOCTL_SET_OPL 0x25
#endif
#endif /* __SOUND_ASOUND_FM_H */ #endif /* __SOUND_ASOUND_FM_H */
...@@ -20,7 +20,6 @@ ...@@ -20,7 +20,6 @@
*/ */
#include <sound/opl3.h> #include <sound/opl3.h>
#define __SND_OSS_COMPAT__
#include <sound/asound_fm.h> #include <sound/asound_fm.h>
/* /*
......
...@@ -94,7 +94,6 @@ ...@@ -94,7 +94,6 @@
* places. * places.
*/ */
#define __SND_OSS_COMPAT__
#include <sound/driver.h> #include <sound/driver.h>
#include <asm/io.h> #include <asm/io.h>
#include <linux/delay.h> #include <linux/delay.h>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment