Merge branch 'origin' into devel

Conflicts:
	sound/soc/pxa/pxa2xx-i2s.c

1 files changed, 7 insertions, 4 deletions

diff --git a/include/sound/emu10k1.h b/include/sound/emu10k1.h
index 10ee28eac018..6a664c3f7c1e 100644
--- a/include/sound/emu10k1.h
+++ b/include/sound/emu10k1.h
@@ -1,6 +1,8 @@
 #ifndef __SOUND_EMU10K1_H
 #define __SOUND_EMU10K1_H
 
+#include <linux/types.h>
+
 /*
  *  Copyright (c) by Jaroslav Kysela <perex@perex.cz>,
  *                   Creative Labs, Inc.
@@ -34,6 +36,7 @@
 #include <sound/timer.h>
 #include <linux/interrupt.h>
 #include <linux/mutex.h>
+
 #include <asm/io.h>
 
 /* ------------------- DEFINES -------------------- */
@@ -2171,7 +2174,7 @@ struct snd_emu10k1_fx8010_code {
         char name[128];
 
         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 */
         struct snd_emu10k1_fx8010_control_gpr __user *gpr_add_controls; /* GPR controls to add/replace */
@@ -2184,11 +2187,11 @@ struct snd_emu10k1_fx8010_code {
         struct snd_emu10k1_fx8010_control_gpr __user *gpr_list_controls; /* listed GPR controls */
 
         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 */
 };
 
 struct snd_emu10k1_fx8010_tram {