From: York Sun <yorksun@freescale.com>
Date: Wed, 16 Dec 2015 06:12:24 +0000 (+0800)
Subject: Revert "include/linux: move typdef for uintptr_t"
X-Git-Tag: v2016.01-rc3~22
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=2e680f92b888b4cb2fde2b0c77cbde22b48933f5;p=oweals%2Fu-boot.git

Revert "include/linux: move typdef for uintptr_t"

This reverts commit e8f954a756a825130d11b9c8fca70101dd8b3ac5, which
causes compiling errors on 32-bit hosts.

Acked-by: Aneesh Bansal <aneesh.bansal@freescale.com>
Signed-off-by: York Sun <yorksun@freescale.com>
---

diff --git a/include/compiler.h b/include/compiler.h
index f853ed4787..47c296e202 100644
--- a/include/compiler.h
+++ b/include/compiler.h
@@ -115,6 +115,9 @@ typedef unsigned int uint;
 #ifdef CONFIG_USE_STDINT
 /* Provided by gcc. */
 #include <stdint.h>
+#else
+/* Type for `void *' pointers. */
+typedef unsigned long int uintptr_t;
 #endif
 
 #include <linux/string.h>
diff --git a/include/linux/types.h b/include/linux/types.h
index c7e8fdb9c2..6f75be4253 100644
--- a/include/linux/types.h
+++ b/include/linux/types.h
@@ -124,7 +124,6 @@ typedef		__UINT64_TYPE__	u_int64_t;
 typedef		__INT64_TYPE__		int64_t;
 #endif
 
-typedef unsigned long uintptr_t;
 /*
  * Below are truly Linux-specific types that should never collide with
  * any application/library that wants linux/types.h.