Merge with http://kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git

[linux-2.6-microblaze.git] / include / sound / pcm_oss.h

diff --git a/include/sound/pcm_oss.h b/include/sound/pcm_oss.h
index 0b67c9d..fddaddd 100644 (file)
--- a/include/sound/pcm_oss.h
+++ b/include/sound/pcm_oss.h
@@ -22,10 +22,7 @@
  *
  */
 
-typedef struct _snd_pcm_plugin snd_pcm_plugin_t;
-typedef struct _snd_pcm_oss_setup snd_pcm_oss_setup_t;
-
-struct _snd_pcm_oss_setup {
+struct snd_pcm_oss_setup {
        char *task_name;
        unsigned int disable:1,
                     direct:1,
@@ -36,10 +33,10 @@ struct _snd_pcm_oss_setup {
                     buggyptr:1;
        unsigned int periods;
        unsigned int period_size;
-       snd_pcm_oss_setup_t *next;
+       struct snd_pcm_oss_setup *next;
 };
 
-typedef struct _snd_pcm_oss_runtime {
+struct snd_pcm_oss_runtime {
        unsigned params: 1,                     /* format/parameter change */
                 prepare: 1,                    /* need to prepare the operation */
                 trigger: 1,                    /* trigger flag */
@@ -59,30 +56,30 @@ typedef struct _snd_pcm_oss_runtime {
        size_t mmap_bytes;
        char *buffer;                           /* vmallocated period */
        size_t buffer_used;                     /* used length from period buffer */
-       snd_pcm_plugin_t *plugin_first;
-       snd_pcm_plugin_t *plugin_last;
+       struct snd_pcm_plugin *plugin_first;
+       struct snd_pcm_plugin *plugin_last;
        unsigned int prev_hw_ptr_interrupt;
-} snd_pcm_oss_runtime_t;
+};
 
-typedef struct _snd_pcm_oss_file {
-       snd_pcm_substream_t *streams[2];
-} snd_pcm_oss_file_t;
+struct snd_pcm_oss_file {
+       struct snd_pcm_substream *streams[2];
+};
 
-typedef struct _snd_pcm_oss_substream {
+struct snd_pcm_oss_substream {
        unsigned oss: 1;                        /* oss mode */
-       snd_pcm_oss_setup_t *setup;             /* active setup */
-       snd_pcm_oss_file_t *file;
-} snd_pcm_oss_substream_t;
+       struct snd_pcm_oss_setup *setup;                /* active setup */
+       struct snd_pcm_oss_file *file;
+};
 
-typedef struct _snd_pcm_oss_stream {
-       snd_pcm_oss_setup_t *setup_list;        /* setup list */
+struct snd_pcm_oss_stream {
+       struct snd_pcm_oss_setup *setup_list;   /* setup list */
         struct semaphore setup_mutex;
-       snd_info_entry_t *proc_entry;
-} snd_pcm_oss_stream_t;
+       struct snd_info_entry *proc_entry;
+};
 
-typedef struct _snd_pcm_oss {
+struct snd_pcm_oss {
        int reg;
        unsigned int reg_mask;
-} snd_pcm_oss_t;
+};
 
 #endif /* __SOUND_PCM_OSS_H */