Changeset 106 for GPL/branches/alsa-resync1/alsa-kernel/include

Timestamp:

May 20, 2007, 1:00:05 AM (18 years ago)

Author:

Brendan Oakley

Message:

More merges to beta12, and fixes. Now compiles, though link phase fails.

Location:

GPL/branches/alsa-resync1/alsa-kernel/include/sound

Files:

• control.h (modified) (1 diff)
• driver.h (modified) (1 diff)

GPL/branches/alsa-resync1/alsa-kernel/include/sound/control.h

@@ -26 +26 @@
 
 typedef struct sndrv_aes_iec958 snd_aes_iec958_t;
-typedef struct sndrv_ctl_card_info snd_ctl_card_info_t;
-typedef struct sndrv_ctl_elem_id snd_ctl_elem_id_t;
-typedef struct sndrv_ctl_elem_list snd_ctl_elem_list_t;
-typedef struct sndrv_ctl_elem_info snd_ctl_elem_info_t;
-typedef struct sndrv_ctl_elem_value snd_ctl_elem_value_t;
+typedef struct snd_ctl_card_info snd_ctl_card_info_t;
+typedef struct snd_ctl_elem_id snd_ctl_elem_id_t;
+typedef struct snd_ctl_elem_list snd_ctl_elem_list_t;
+typedef struct snd_ctl_elem_info snd_ctl_elem_info_t;
+typedef struct snd_ctl_elem_value snd_ctl_elem_value_t;
 typedef enum sndrv_ctl_event_type snd_ctl_event_type_t;
 typedef struct sndrv_ctl_event snd_ctl_event_t;

GPL/branches/alsa-resync1/alsa-kernel/include/sound/driver.h

@@ -90 +90 @@
 #define snd_enter_user() 0
 #define snd_leave_user(a)
-#define dec_mod_count(a)        (*(unsigned long *)a)--
 #endif