Merge branch 'master' of /usr/src/ntfs-2.6/

1 files changed, 18 insertions, 18 deletions

diff --git a/include/sound/sfnt_info.h b/include/sound/sfnt_info.h
index 674585f88a31..5d1ab9c4950f 100644
--- a/include/sound/sfnt_info.h
+++ b/include/sound/sfnt_info.h
@@ -35,7 +35,7 @@
 #endif
 
 /* patch interface header: 16 bytes */
-typedef struct soundfont_patch_info_t {
+struct soundfont_patch_info {
         unsigned short key;             /* use the key below */
 #define SNDRV_OSS_SOUNDFONT_PATCH               SNDRV_OSS_PATCHKEY(0x07)
 
@@ -59,7 +59,7 @@ typedef struct soundfont_patch_info_t {
         short reserved;                 /* word alignment data */
 
         /* the actual patch data begins after this */
-} soundfont_patch_info_t;
+};
 
 
 /*
@@ -68,7 +68,7 @@ typedef struct soundfont_patch_info_t {
 
 #define SNDRV_SFNT_PATCH_NAME_LEN       32
 
-typedef struct soundfont_open_parm_t {
+struct soundfont_open_parm {
         unsigned short type;            /* sample type */
 #define SNDRV_SFNT_PAT_TYPE_MISC        0
 #define SNDRV_SFNT_PAT_TYPE_GUS 6
@@ -78,7 +78,7 @@ typedef struct soundfont_open_parm_t {
 
         short reserved;
         char name[SNDRV_SFNT_PATCH_NAME_LEN];
-} soundfont_open_parm_t;
+};
 
 
 /*
@@ -86,7 +86,7 @@ typedef struct soundfont_open_parm_t {
  */
 
 /* wave table envelope & effect parameters to control EMU8000 */
-typedef struct soundfont_voice_parm_t {
+struct soundfont_voice_parm {
         unsigned short moddelay;        /* modulation delay (0x8000) */
         unsigned short modatkhld;       /* modulation attack & hold time (0x7f7f) */
         unsigned short moddcysus;       /* modulation decay & sustain (0x7f7f) */
@@ -108,11 +108,11 @@ typedef struct soundfont_voice_parm_t {
         unsigned char chorus;           /* chorus send (0x00) */
         unsigned char reverb;           /* reverb send (0x00) */
         unsigned short reserved[4];     /* not used */
-} soundfont_voice_parm_t;
+};
 
 
 /* wave table parameters: 92 bytes */
-typedef struct soundfont_voice_info_t {
+struct soundfont_voice_info {
         unsigned short sf_id;           /* file id (should be zero) */
         unsigned short sample;          /* sample id */
         int start, end;                 /* sample offset correction */
@@ -135,13 +135,13 @@ typedef struct soundfont_voice_info_t {
         unsigned char amplitude;        /* sample volume (127 max) */
         unsigned char attenuation;      /* attenuation (0.375dB) */
         short scaleTuning;              /* pitch scale tuning(%), normally 100 */
-        soundfont_voice_parm_t parm;    /* voice envelope parameters */
+        struct soundfont_voice_parm parm;       /* voice envelope parameters */
         unsigned short sample_mode;     /* sample mode_flag (set by driver) */
-} soundfont_voice_info_t;
+};
 
 
 /* instrument info header: 4 bytes */
-typedef struct soundfont_voice_rec_hdr_t {
+struct soundfont_voice_rec_hdr {
         unsigned char bank;             /* midi bank number */
         unsigned char instr;            /* midi preset number */
         char nvoices;                   /* number of voices */
@@ -149,7 +149,7 @@ typedef struct soundfont_voice_rec_hdr_t {
 #define SNDRV_SFNT_WR_APPEND            0       /* append anyway */
 #define SNDRV_SFNT_WR_EXCLUSIVE         1       /* skip if already exists */
 #define SNDRV_SFNT_WR_REPLACE           2       /* replace if already exists */
-} soundfont_voice_rec_hdr_t;
+};
 
 
 /*
@@ -157,7 +157,7 @@ typedef struct soundfont_voice_rec_hdr_t {
  */
 
 /* wave table sample header: 32 bytes */
-typedef struct soundfont_sample_info_t {
+struct soundfont_sample_info {
         unsigned short sf_id;           /* file id (should be zero) */
         unsigned short sample;          /* sample id */
         int start, end;                 /* start & end offset */
@@ -174,17 +174,17 @@ typedef struct soundfont_sample_info_t {
 #define SNDRV_SFNT_SAMPLE_STEREO_RIGHT  64      /* stereo right sound */
 #define SNDRV_SFNT_SAMPLE_REVERSE_LOOP  128     /* reverse looping */
         unsigned int truesize;          /* used memory size (set by driver) */
-} soundfont_sample_info_t;
+};
 
 
 /*
  * voice preset mapping (aliasing)
  */
 
-typedef struct soundfont_voice_map_t {
+struct soundfont_voice_map {
         int map_bank, map_instr, map_key;       /* key = -1 means all keys */
         int src_bank, src_instr, src_key;
-} soundfont_voice_map_t;
+};
 
 
 /*
@@ -195,7 +195,7 @@ typedef struct soundfont_voice_map_t {
 
 #define SNDRV_EMUX_VERSION      ((1 << 16) | (0 << 8) | 0)      /* 1.0.0 */
 
-struct sndrv_emux_misc_mode {
+struct snd_emux_misc_mode {
         int port;       /* -1 = all */
         int mode;
         int value;
@@ -204,11 +204,11 @@ struct sndrv_emux_misc_mode {
 
 enum {
         SNDRV_EMUX_IOCTL_VERSION = _IOR('H', 0x80, unsigned int),
-        SNDRV_EMUX_IOCTL_LOAD_PATCH = _IOWR('H', 0x81, soundfont_patch_info_t),
+        SNDRV_EMUX_IOCTL_LOAD_PATCH = _IOWR('H', 0x81, struct soundfont_patch_info),
         SNDRV_EMUX_IOCTL_RESET_SAMPLES = _IO('H', 0x82),
         SNDRV_EMUX_IOCTL_REMOVE_LAST_SAMPLES = _IO('H', 0x83),
         SNDRV_EMUX_IOCTL_MEM_AVAIL = _IOW('H', 0x84, int),
-        SNDRV_EMUX_IOCTL_MISC_MODE = _IOWR('H', 0x84, struct sndrv_emux_misc_mode),
+        SNDRV_EMUX_IOCTL_MISC_MODE = _IOWR('H', 0x84, struct snd_emux_misc_mode),
 };
 
 #endif /* __SOUND_SFNT_INFO_H */