summaryrefslogtreecommitdiff
path: root/tools/arch/xtensa
diff options
context:
space:
mode:
authorWolfram Sang <wsa@the-dreams.de>2019-05-03 16:20:04 +0300
committerWolfram Sang <wsa@the-dreams.de>2019-05-03 16:20:58 +0300
commitd00afd5ede1c29a6dc59be2d7fb7d6ef28eb85c5 (patch)
treee194b1968e54380a6654abf7d3a037ca0a010280 /tools/arch/xtensa
parent9a51b86a61214a297cdfc1bb705b7267f9455ae6 (diff)
parentd5984d2a312144bedccf32aea2298f8df05bb617 (diff)
downloadlinux-d00afd5ede1c29a6dc59be2d7fb7d6ef28eb85c5.tar.xz
Merge branch 'i2c-mux/for-next' of https://github.com/peda-r/i2c-mux into i2c/for-5.2
Mainly some pca954x work, i.e. removal of unused platform data support and added support for sysfs interface for manipulating/examining the idle state. And then a mechanical cocci-style patch.
Diffstat (limited to 'tools/arch/xtensa')
-rw-r--r--tools/arch/xtensa/include/uapi/asm/mman.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/tools/arch/xtensa/include/uapi/asm/mman.h b/tools/arch/xtensa/include/uapi/asm/mman.h
index 34dde6f44dae..f2b08c990afc 100644
--- a/tools/arch/xtensa/include/uapi/asm/mman.h
+++ b/tools/arch/xtensa/include/uapi/asm/mman.h
@@ -27,8 +27,6 @@
#define MAP_NONBLOCK 0x20000
#define MAP_NORESERVE 0x0400
#define MAP_POPULATE 0x10000
-#define MAP_PRIVATE 0x002
-#define MAP_SHARED 0x001
#define MAP_STACK 0x40000
#define PROT_EXEC 0x4
#define PROT_GROWSDOWN 0x01000000