diff options
| -rw-r--r-- | include/compiler.h | 3 | ||||
| -rw-r--r-- | include/linux/types.h | 1 |
2 files changed, 1 insertions, 3 deletions
diff --git a/include/compiler.h b/include/compiler.h index 47c296e202..f853ed4787 100644 --- a/include/compiler.h +++ b/include/compiler.h @@ -115,9 +115,6 @@ 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 6f75be4253..c7e8fdb9c2 100644 --- a/include/linux/types.h +++ b/include/linux/types.h @@ -124,6 +124,7 @@ 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. |