Merge branch 'master' into can-usb1

[lincan.git] / lincan / include / constants.h

diff --git a/lincan/include/constants.h b/lincan/include/constants.h
index 82383c265967650914e1e6a204a7aab35cfbd07c..006b45b65e70c42a800cf03b9f385aa71b27e713 100644 (file)
--- a/lincan/include/constants.h
+++ b/lincan/include/constants.h
@@ -44,7 +44,7 @@
 /* Version of the driver */
 #define CAN_DRV_VER_MAJOR 0
 #define CAN_DRV_VER_MINOR 3
-#define CAN_DRV_VER_PATCH 4
+#define CAN_DRV_VER_PATCH 5
 #define CAN_DRV_VER ((CAN_DRV_VER_MAJOR<<16) | (CAN_DRV_VER_MINOR<<8) | CAN_DRV_VER_PATCH)
 
 /* Default driver major number, see /usr/src/linux/Documentation/devices.txt */
@@ -108,6 +108,7 @@
 #define CHIP_IRQ_VME     (1<<5)  /* interrupt is VME bus and requires VME bridge */
 #define CHIP_IRQ_CUSTOM  (1<<6)  /* custom interrupt provided by board or chip code */
 #define CHIP_IRQ_FAST    (1<<7)  /* interrupt handler only schedules postponed processing */
+#define CHIP_KEEP_DATA   (1<<8)  /* let the hotplug device free its chip_data structure itself */
 
 #define CHIP_MAX_IRQLOOP 1000