diff --git a/[refs] b/[refs]
index 6e89cbe3f866..8d2b82cc08d5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d68a8635c5b706e3c037d89fd130e62ddce5c823
+refs/heads/master: 4ba47b8f88b6893e79e704d37bad7044c376fc4f
diff --git a/trunk/drivers/staging/comedi/drivers/icp_multi.c b/trunk/drivers/staging/comedi/drivers/icp_multi.c
index 95262c731d87..e40c8f0c1765 100644
--- a/trunk/drivers/staging/comedi/drivers/icp_multi.c
+++ b/trunk/drivers/staging/comedi/drivers/icp_multi.c
@@ -60,9 +60,6 @@ There are 4 x 12-bit Analogue Outputs.  Ranges : 5V, 10V, +/-5V, +/-10V
 
 #define PCI_DEVICE_ID_ICP_MULTI	0x8000
 
-/*  Hardware types of the cards */
-#define TYPE_ICP_MULTI	0
-
 #define IORANGE_ICP_MULTI 	32
 
 #define ICP_MULTI_ADC_CSR	0	/* R/W: ADC command/status register */
@@ -129,7 +126,6 @@ struct boardtype {
 	int device_id;
 	int iorange;		/*  I/O range len */
 	char have_irq;		/*  1=card support IRQ */
-	char cardtype;		/*  0=ICP Multi */
 };
 
 struct icp_multi_private {
@@ -877,7 +873,6 @@ static const struct boardtype boardtypes[] = {
 		.device_id	= PCI_DEVICE_ID_ICP_MULTI,
 		.iorange	= IORANGE_ICP_MULTI,
 		.have_irq	= 1,
-		.cardtype	= TYPE_ICP_MULTI,
 	},
 };