diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-01-29 18:24:20 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-01-29 18:24:20 -0800 |
commit | 30c867eebfbd1c25310aec9f152578deaf793080 (patch) | |
tree | 1afe19bdda8a45e2842e8c7c3fd02b799242fab0 /arch/blackfin/include/uapi/asm/siginfo.h | |
parent | cac9283ca3dc7f4404b4034c6f06a3076c033b04 (diff) | |
parent | 58095fdaaf1cee12d8e01aa20f94b976e3137d27 (diff) | |
download | linux-stable-30c867eebfbd1c25310aec9f152578deaf793080.tar.gz linux-stable-30c867eebfbd1c25310aec9f152578deaf793080.tar.bz2 linux-stable-30c867eebfbd1c25310aec9f152578deaf793080.zip |
Merge tag 'blackfin-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/realmz6/blackfin-linux
Pull blackfin updates from Steven Miao:
"Some minor changes and bug fixes"
* tag 'blackfin-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/realmz6/blackfin-linux:
From: Eunbong Song <eunb.song@samsung.com>
Add platfrom device resource for bfin-sport on bf533 stamp
fix build error for bf527-ezkit_defconfig for old silicon
blackfin: Support L1 SRAM parity checking feature on bf60x
blackfin: bf609: update the anomaly list to Nov 2013
blackfin: delete non-required instances of <linux/init.h>
From: Paul Walmsley <pwalmsley@nvidia.com>
06/18] smp, blackfin: kill SMP single function call interrupt
arch: blackfin: uapi: be sure of "_UAPI" prefix for all guard macros
Diffstat (limited to 'arch/blackfin/include/uapi/asm/siginfo.h')
-rw-r--r-- | arch/blackfin/include/uapi/asm/siginfo.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/blackfin/include/uapi/asm/siginfo.h b/arch/blackfin/include/uapi/asm/siginfo.h index 3e81306394e2..c72f4e6e386f 100644 --- a/arch/blackfin/include/uapi/asm/siginfo.h +++ b/arch/blackfin/include/uapi/asm/siginfo.h @@ -4,8 +4,8 @@ * Licensed under the GPL-2 or later. */ -#ifndef _BFIN_SIGINFO_H -#define _BFIN_SIGINFO_H +#ifndef _UAPI_BFIN_SIGINFO_H +#define _UAPI_BFIN_SIGINFO_H #include <linux/types.h> #include <asm-generic/siginfo.h> @@ -38,4 +38,4 @@ */ #define SEGV_STACKFLOW (__SI_FAULT|3) /* stack overflow */ -#endif +#endif /* _UAPI_BFIN_SIGINFO_H */ |