diff --git a/[refs] b/[refs]
index d740a692e66a..db5f7cb629b0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: eb97e08e04048d47d5a16a9c6428cda5dda8c4f1
+refs/heads/master: 6d4ef6d6360193c6acd0d41a88ddd7034af286f3
diff --git a/trunk/drivers/staging/comedi/drivers/das08_cs.c b/trunk/drivers/staging/comedi/drivers/das08_cs.c
index b7efcb4f4239..d02250e6f0c1 100644
--- a/trunk/drivers/staging/comedi/drivers/das08_cs.c
+++ b/trunk/drivers/staging/comedi/drivers/das08_cs.c
@@ -147,24 +147,10 @@ static void das08_pcmcia_config(struct pcmcia_device *link)
 
 }
 
-struct local_info_t {
-	struct pcmcia_device *link;
-	struct bus_operations *bus;
-};
-
 static int das08_pcmcia_attach(struct pcmcia_device *link)
 {
-	struct local_info_t *local;
-
 	dev_dbg(&link->dev, "das08_pcmcia_attach()\n");
 
-	/* Allocate space for private device-specific data */
-	local = kzalloc(sizeof(struct local_info_t), GFP_KERNEL);
-	if (!local)
-		return -ENOMEM;
-	local->link = link;
-	link->priv = local;
-
 	cur_dev = link;
 
 	das08_pcmcia_config(link);
@@ -178,10 +164,6 @@ static void das08_pcmcia_detach(struct pcmcia_device *link)
 	dev_dbg(&link->dev, "das08_pcmcia_detach\n");
 
 	das08_pcmcia_release(link);
-
-	/* This points to the parent struct local_info_t struct */
-	kfree(link->priv);
-
 }
 
 static const struct pcmcia_device_id das08_cs_id_table[] = {