diff options
| author | Joerg Roedel <jroedel@suse.de> | 2015-01-26 13:42:49 +0100 |
|---|---|---|
| committer | Joerg Roedel <jroedel@suse.de> | 2015-01-26 13:42:49 +0100 |
| commit | fd47b693c3c694da8210b5a0c01b1e379f4d9865 (patch) | |
| tree | 84d8c5596df7f6eb295ac380b8ddb983af6c906d /include/uapi/linux | |
| parent | 89aa57d15f1833323b001c3764141311ac6179a2 (diff) | |
| parent | 16753322983bcca0eca6d81f20d23277df0d6cf7 (diff) | |
| download | cachepc-linux-fd47b693c3c694da8210b5a0c01b1e379f4d9865.tar.gz cachepc-linux-fd47b693c3c694da8210b5a0c01b1e379f4d9865.zip | |
Merge branch 'arm/smmu' into arm/renesas
Diffstat (limited to 'include/uapi/linux')
| -rw-r--r-- | include/uapi/linux/can/netlink.h | 1 | ||||
| -rw-r--r-- | include/uapi/linux/uinput.h | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/include/uapi/linux/can/netlink.h b/include/uapi/linux/can/netlink.h index 3e4323a3918d..94ffe0c83ce7 100644 --- a/include/uapi/linux/can/netlink.h +++ b/include/uapi/linux/can/netlink.h @@ -98,6 +98,7 @@ struct can_ctrlmode { #define CAN_CTRLMODE_BERR_REPORTING 0x10 /* Bus-error reporting */ #define CAN_CTRLMODE_FD 0x20 /* CAN FD mode */ #define CAN_CTRLMODE_PRESUME_ACK 0x40 /* Ignore missing CAN ACKs */ +#define CAN_CTRLMODE_FD_NON_ISO 0x80 /* CAN FD in non-ISO mode */ /* * CAN device statistics diff --git a/include/uapi/linux/uinput.h b/include/uapi/linux/uinput.h index baeab83deb64..013c9d8db372 100644 --- a/include/uapi/linux/uinput.h +++ b/include/uapi/linux/uinput.h @@ -82,7 +82,7 @@ struct uinput_ff_erase { * The complete sysfs path is then /sys/devices/virtual/input/--NAME-- * Usually, it is in the form "inputN" */ -#define UI_GET_SYSNAME(len) _IOC(_IOC_READ, UINPUT_IOCTL_BASE, 300, len) +#define UI_GET_SYSNAME(len) _IOC(_IOC_READ, UINPUT_IOCTL_BASE, 44, len) /** * UI_GET_VERSION - Return version of uinput protocol @@ -91,7 +91,7 @@ struct uinput_ff_erase { * the integer pointed to by the ioctl argument. The protocol version * is hard-coded in the kernel and is independent of the uinput device. */ -#define UI_GET_VERSION _IOR(UINPUT_IOCTL_BASE, 301, unsigned int) +#define UI_GET_VERSION _IOR(UINPUT_IOCTL_BASE, 45, unsigned int) /* * To write a force-feedback-capable driver, the upload_effect |