diff options
| author | Tom Rini <trini@ti.com> | 2014-09-10 06:59:49 -0400 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2014-09-10 06:59:49 -0400 |
| commit | b7a809957bcd72c2efa49ce733774b1e28878585 (patch) | |
| tree | 8659061f5fbbbda76b76ae204cb00a5cedb299a5 | |
| parent | 5935408a4092a1a132ff1ce866374ab1ed555bcd (diff) | |
| parent | 1a7ae2585410cdd6d88713bcd941463370aacd2e (diff) | |
| download | u-boot-imx-b7a809957bcd72c2efa49ce733774b1e28878585.zip u-boot-imx-b7a809957bcd72c2efa49ce733774b1e28878585.tar.gz u-boot-imx-b7a809957bcd72c2efa49ce733774b1e28878585.tar.bz2 | |
Merge branch 'master' of git://www.denx.de/git/u-boot-microblaze
| -rw-r--r-- | arch/microblaze/include/asm/posix_types.h | 4 | ||||
| -rw-r--r-- | include/systemace.h | 1 |
2 files changed, 4 insertions, 1 deletions
diff --git a/arch/microblaze/include/asm/posix_types.h b/arch/microblaze/include/asm/posix_types.h index 38dc5aa..ccc6235 100644 --- a/arch/microblaze/include/asm/posix_types.h +++ b/arch/microblaze/include/asm/posix_types.h @@ -27,7 +27,11 @@ typedef int __kernel_pid_t; typedef unsigned short __kernel_ipc_pid_t; typedef unsigned int __kernel_uid_t; typedef unsigned int __kernel_gid_t; +#ifdef __GNUC__ +typedef __SIZE_TYPE__ __kernel_size_t; +#else typedef unsigned int __kernel_size_t; +#endif typedef int __kernel_ssize_t; typedef int __kernel_ptrdiff_t; typedef long __kernel_time_t; diff --git a/include/systemace.h b/include/systemace.h index 73affc4..3f342d5 100644 --- a/include/systemace.h +++ b/include/systemace.h @@ -6,7 +6,6 @@ * * SPDX-License-Identifier: GPL-2.0+ */ -#ident "$Id:$" #ifdef CONFIG_SYSTEMACE |