diff options
author | Tom Rini <trini@konsulko.com> | 2015-12-14 20:27:23 -0500 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2015-12-14 20:27:23 -0500 |
commit | e6e3faa5c2da591cd3e0f2047a74cfc832e7b738 (patch) | |
tree | 08c12b0c61cb4edd70df347c61ea36d2088274d3 /include/compiler.h | |
parent | 312db9f75f50b339310474d72c8524cef2bd7931 (diff) | |
parent | 989c5f0a8f8694ac92eb0d6cff8745ae8659364f (diff) | |
download | u-boot-e6e3faa5c2da591cd3e0f2047a74cfc832e7b738.tar.gz |
Merge branch 'master' of git://git.denx.de/u-boot-fsl-qoriq
Diffstat (limited to 'include/compiler.h')
-rw-r--r-- | include/compiler.h | 3 |
1 files changed, 0 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> |