diff options
| author | York Sun <yorksun@freescale.com> | 2015-12-16 14:12:24 +0800 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2015-12-16 07:11:15 -0500 |
| commit | 2e680f92b888b4cb2fde2b0c77cbde22b48933f5 (patch) | |
| tree | 07189cc75fc5b3b4b06e89671e3648cea603f7e9 /include | |
| parent | e6e3faa5c2da591cd3e0f2047a74cfc832e7b738 (diff) | |
| download | talos-obmc-uboot-2e680f92b888b4cb2fde2b0c77cbde22b48933f5.tar.gz talos-obmc-uboot-2e680f92b888b4cb2fde2b0c77cbde22b48933f5.zip | |
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>
Diffstat (limited to 'include')
| -rw-r--r-- | include/compiler.h | 3 | ||||
| -rw-r--r-- | include/linux/types.h | 1 |
2 files changed, 3 insertions, 1 deletions
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. |
