summaryrefslogtreecommitdiff
path: root/arch/blackfin/include/uapi/asm/poll.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2014-01-30 06:24:20 +0400
committerLinus Torvalds <torvalds@linux-foundation.org>2014-01-30 06:24:20 +0400
commit30c867eebfbd1c25310aec9f152578deaf793080 (patch)
tree1afe19bdda8a45e2842e8c7c3fd02b799242fab0 /arch/blackfin/include/uapi/asm/poll.h
parentcac9283ca3dc7f4404b4034c6f06a3076c033b04 (diff)
parent58095fdaaf1cee12d8e01aa20f94b976e3137d27 (diff)
downloadlinux-30c867eebfbd1c25310aec9f152578deaf793080.tar.xz
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/poll.h')
-rw-r--r--arch/blackfin/include/uapi/asm/poll.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/blackfin/include/uapi/asm/poll.h b/arch/blackfin/include/uapi/asm/poll.h
index 072d8966c5c3..99c7d6816da0 100644
--- a/arch/blackfin/include/uapi/asm/poll.h
+++ b/arch/blackfin/include/uapi/asm/poll.h
@@ -5,12 +5,12 @@
*
*/
-#ifndef __BFIN_POLL_H
-#define __BFIN_POLL_H
+#ifndef _UAPI__BFIN_POLL_H
+#define _UAPI__BFIN_POLL_H
#define POLLWRNORM 4 /* POLLOUT */
#define POLLWRBAND 256
#include <asm-generic/poll.h>
-#endif
+#endif /* _UAPI__BFIN_POLL_H */