From 38c36028042e649f0a6c4d447a7ce1195b6a6dbc Mon Sep 17 00:00:00 2001
From: Marc Kleine-Budde <mkl@pengutronix.de>
Date: Wed, 23 Dec 2009 01:27:48 +0000
Subject: [PATCH] --- yaml --- r: 183417 b: refs/heads/master c:
 c1c5523dd1517250cac8b15a4acbc237c24a67d4 h: refs/heads/master i:   183415:
 c827cf31787ac26b249a30e0f5587b65b32620a6 v: v3

---
 [refs]                            | 2 +-
 trunk/include/linux/can/netlink.h | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index ebba91b82947..3d7838cf50cb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 20dd3850bcf860561496827b711fa10fecf6e787
+refs/heads/master: c1c5523dd1517250cac8b15a4acbc237c24a67d4
diff --git a/trunk/include/linux/can/netlink.h b/trunk/include/linux/can/netlink.h
index 9ecbb7871c0e..c818335fbb13 100644
--- a/trunk/include/linux/can/netlink.h
+++ b/trunk/include/linux/can/netlink.h
@@ -80,6 +80,7 @@ struct can_ctrlmode {
 #define CAN_CTRLMODE_LOOPBACK	0x1	/* Loopback mode */
 #define CAN_CTRLMODE_LISTENONLY	0x2 	/* Listen-only mode */
 #define CAN_CTRLMODE_3_SAMPLES	0x4	/* Triple sampling mode */
+#define CAN_CTRLMODE_ONE_SHOT	0x8	/* One-Shot mode */
 
 /*
  * CAN device statistics