diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-01-30 03:24:20 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-01-30 03:24:20 +0100 |
| commit | 30c867eebfbd1c25310aec9f152578deaf793080 (patch) | |
| tree | 1afe19bdda8a45e2842e8c7c3fd02b799242fab0 /arch/blackfin/include/uapi/asm/ioctls.h | |
| parent | Merge branch 'x86-intel-mid-for-linus' of git://git.kernel.org/pub/scm/linux/... (diff) | |
| parent | From: Eunbong Song <eunb.song@samsung.com> (diff) | |
| download | linux-30c867eebfbd1c25310aec9f152578deaf793080.tar.xz linux-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/ioctls.h')
| -rw-r--r-- | arch/blackfin/include/uapi/asm/ioctls.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/blackfin/include/uapi/asm/ioctls.h b/arch/blackfin/include/uapi/asm/ioctls.h index eca8d75b0a8a..9a41c20fc83d 100644 --- a/arch/blackfin/include/uapi/asm/ioctls.h +++ b/arch/blackfin/include/uapi/asm/ioctls.h @@ -1,7 +1,7 @@ -#ifndef __ARCH_BFIN_IOCTLS_H__ -#define __ARCH_BFIN_IOCTLS_H__ +#ifndef _UAPI__ARCH_BFIN_IOCTLS_H__ +#define _UAPI__ARCH_BFIN_IOCTLS_H__ #define FIOQSIZE 0x545E #include <asm-generic/ioctls.h> -#endif +#endif /* _UAPI__ARCH_BFIN_IOCTLS_H__ */ |