Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

[pandora-kernel.git] / arch / xtensa / include / asm / uaccess.h

diff --git a/arch/xtensa/include/asm/uaccess.h b/arch/xtensa/include/asm/uaccess.h
index 5b0c18c..82d4e38 100644 (file)
--- a/arch/xtensa/include/asm/uaccess.h
+++ b/arch/xtensa/include/asm/uaccess.h
@@ -17,6 +17,7 @@
 #define _XTENSA_UACCESS_H
 
 #include <linux/errno.h>
 #define _XTENSA_UACCESS_H
 
 #include <linux/errno.h>

+#include <asm/types.h>

 
 #define VERIFY_READ    0
 #define VERIFY_WRITE   1
 
 #define VERIFY_READ    0
 #define VERIFY_WRITE   1


@@ -26,7 +27,6 @@
 #include <asm/current.h>
 #include <asm/asm-offsets.h>
 #include <asm/processor.h>
 #include <asm/current.h>
 #include <asm/asm-offsets.h>
 #include <asm/processor.h>

-#include <asm/types.h>

 
 /*
  * These assembly macros mirror the C macros that follow below.  They
 
 /*
  * These assembly macros mirror the C macros that follow below.  They


@@ -157,7 +157,6 @@
 #else /* __ASSEMBLY__ not defined */
 
 #include <linux/sched.h>
 #else /* __ASSEMBLY__ not defined */
 
 #include <linux/sched.h>

-#include <asm/types.h>

 
 /*
  * The fs value determines whether argument validity checking should
 
 /*
  * The fs value determines whether argument validity checking should