aboutsummaryrefslogtreecommitdiffstats
path: root/include/uapi/linux/msg.h
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-01-16 02:26:35 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-01-16 02:26:35 -0500
commitfeee830394cab4e697d2204da6d10a606619de3d (patch)
treef2ba451f9ea9f05b21d0df9a4237bd01b711bcfc /include/uapi/linux/msg.h
parente0f8d323f34dee3f47388dc3d87e7c428b077a0d (diff)
parent689557d3c7045320958d5bc4141088f7b4dff7ba (diff)
Merge tag 'extcon-for-3.9' of git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon into char-misc-next
Chanwoo writes: This is patch set of extcon for v3.9. Update to max77693/max8997 extcon driver: - Using MHL_TA cable for charging. - Support JIG cable. - Support Dock-Audio device for playing music and button of device. - Support Dock-Smart device for desktop mode with mouse/keyboard. - Set default UART/USB path on probe(). - Check the state/type of cable after completing initialization. - Code clean to remove duplicate code and bug fix related to sequence of interrupt. - Fix irq_flag of max8997/max77693 driver. Update to arizona extcon driver: - Headphone measurements. - Alternative detection mechanism for non-default system designs. - Microphone clamp integration. - Support for additional detection pin. - MICBIAS rise time configuration.
Diffstat (limited to 'include/uapi/linux/msg.h')
-rw-r--r--include/uapi/linux/msg.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/uapi/linux/msg.h b/include/uapi/linux/msg.h
index 78dbd2f996a3..22d95c6854e0 100644
--- a/include/uapi/linux/msg.h
+++ b/include/uapi/linux/msg.h
@@ -10,6 +10,7 @@
10/* msgrcv options */ 10/* msgrcv options */
11#define MSG_NOERROR 010000 /* no error if message is too big */ 11#define MSG_NOERROR 010000 /* no error if message is too big */
12#define MSG_EXCEPT 020000 /* recv any msg except of specified type.*/ 12#define MSG_EXCEPT 020000 /* recv any msg except of specified type.*/
13#define MSG_COPY 040000 /* copy (not remove) all queue messages */
13 14
14/* Obsolete, used only for backwards compatibility and libc5 compiles */ 15/* Obsolete, used only for backwards compatibility and libc5 compiles */
15struct msqid_ds { 16struct msqid_ds {