summaryrefslogtreecommitdiffstats
path: root/include/uapi/linux/gpio.h
diff options
context:
space:
mode:
authorLinus Walleij2016-03-10 09:48:06 +0100
committerLinus Walleij2016-03-10 10:02:52 +0100
commitfae98164463948eb31d638fe207c25a3d2b9312f (patch)
treea5ece514ceeeca6b0f6173ccd4f42ff17c79b43a /include/uapi/linux/gpio.h
parentgpio: tps65912: fix bad merge (diff)
downloadkernel-qcow2-linux-fae98164463948eb31d638fe207c25a3d2b9312f.tar.gz
kernel-qcow2-linux-fae98164463948eb31d638fe207c25a3d2b9312f.tar.xz
kernel-qcow2-linux-fae98164463948eb31d638fe207c25a3d2b9312f.zip
gpio: uapi: use 0xB4 as ioctl() major
The previous 'o' is in conflict and not very orderly assigned. We want to select an ioctl() major that does not conflict with the existining ones. Add the new reserved major (0xB4) to Documentation/ioctl/ioctl-number.txt Fixes: 3c702e9987e2 ("gpio: add a userspace chardev ABI for GPIOs") Suggested-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'include/uapi/linux/gpio.h')
-rw-r--r--include/uapi/linux/gpio.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/uapi/linux/gpio.h b/include/uapi/linux/gpio.h
index dfe8ade2742d..d0a3cac72250 100644
--- a/include/uapi/linux/gpio.h
+++ b/include/uapi/linux/gpio.h
@@ -52,7 +52,7 @@ struct gpioline_info {
char consumer[32];
};
-#define GPIO_GET_CHIPINFO_IOCTL _IOR('o', 0x01, struct gpiochip_info)
-#define GPIO_GET_LINEINFO_IOCTL _IOWR('o', 0x02, struct gpioline_info)
+#define GPIO_GET_CHIPINFO_IOCTL _IOR(0xB4, 0x01, struct gpiochip_info)
+#define GPIO_GET_LINEINFO_IOCTL _IOWR(0xB4, 0x02, struct gpioline_info)
#endif /* _UAPI_GPIO_H_ */