diff options
author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2013-12-09 22:22:40 -0800 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2013-12-09 22:22:40 -0800 |
commit | 5d43889c07bb38694742936aa70d1187c012e198 (patch) | |
tree | 73809dddae39ae3b746396e9779142dbd1973f33 /include/uapi/linux/packet_diag.h | |
parent | Input: ALPS - add support for DualPoint device on Dell XT2 model (diff) | |
parent | Linux 3.13-rc3 (diff) | |
download | linux-dev-5d43889c07bb38694742936aa70d1187c012e198.tar.xz linux-dev-5d43889c07bb38694742936aa70d1187c012e198.zip |
Merge tag 'v3.13-rc3' into for-linus
Merging with the mainline to sync up on changes to serio core.
Diffstat (limited to 'include/uapi/linux/packet_diag.h')
-rw-r--r-- | include/uapi/linux/packet_diag.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/uapi/linux/packet_diag.h b/include/uapi/linux/packet_diag.h index b2cc0cd9c4d9..d08c63f3dd6f 100644 --- a/include/uapi/linux/packet_diag.h +++ b/include/uapi/linux/packet_diag.h @@ -29,6 +29,7 @@ struct packet_diag_msg { }; enum { + /* PACKET_DIAG_NONE, standard nl API requires this attribute! */ PACKET_DIAG_INFO, PACKET_DIAG_MCLIST, PACKET_DIAG_RX_RING, |