Changeset 426 for GPL/trunk/alsa-kernel/include/sound/emu10k1.h

Timestamp:

May 9, 2009, 11:45:26 AM (16 years ago)

Author:

Paul Smedley

Message:

Update alsa-kernel to ALSA 1.0.20 level

File:

• GPL/trunk/alsa-kernel/include/sound/emu10k1.h (modified) (4 diffs)

GPL/trunk/alsa-kernel/include/sound/emu10k1.h

@@ -1 +1 @@
 #ifndef __SOUND_EMU10K1_H
 #define __SOUND_EMU10K1_H
+
+#include <linux/types.h>
 
 /*
@@ -35 +37 @@
 #include <linux/interrupt.h>
 #include <linux/mutex.h>
+
 #include <asm/io.h>
 
@@ -2172 +2175 @@
 
         DECLARE_BITMAP(gpr_valid, 0x200); /* bitmask of valid initializers */
-        u_int32_t __user *gpr_map;        /* initializers */
+        __u32 __user *gpr_map;          /* initializers */
 
         unsigned int gpr_add_control_count; /* count of GPR controls to add/replace */
@@ -2185 +2188 @@
 
         DECLARE_BITMAP(tram_valid, 0x100); /* bitmask of valid initializers */
-        u_int32_t __user *tram_data_map;  /* data initializers */
-        u_int32_t __user *tram_addr_map;  /* map initializers */
+        __u32 __user *tram_data_map;      /* data initializers */
+        __u32 __user *tram_addr_map;      /* map initializers */
 
         DECLARE_BITMAP(code_valid, 1024); /* bitmask of valid instructions */
-        u_int32_t __user *code;           /* one instruction - 64 bits */
+        __u32 __user *code;               /* one instruction - 64 bits */
 };