diff --git a/[refs] b/[refs]
index 2aad6e15ac8f..7492db1c828b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 87fe1452c6b0154e43fa7c544977279a504ad0e4
+refs/heads/master: 25736670bce6b860910ca789ab628bde46be71e6
diff --git a/trunk/drivers/staging/comedi/drivers/quatech_daqp_cs.c b/trunk/drivers/staging/comedi/drivers/quatech_daqp_cs.c
index 869a4afc440e..6eab3bbb378b 100644
--- a/trunk/drivers/staging/comedi/drivers/quatech_daqp_cs.c
+++ b/trunk/drivers/staging/comedi/drivers/quatech_daqp_cs.c
@@ -790,16 +790,11 @@ static int daqp_auto_attach(struct comedi_device *dev,
 	return 0;
 }
 
-static void daqp_detach(struct comedi_device *dev)
-{
-	comedi_pcmcia_disable(dev);
-}
-
 static struct comedi_driver driver_daqp = {
 	.driver_name	= "quatech_daqp_cs",
 	.module		= THIS_MODULE,
 	.auto_attach	= daqp_auto_attach,
-	.detach		= daqp_detach,
+	.detach		= comedi_pcmcia_disable,
 };
 
 static int daqp_cs_suspend(struct pcmcia_device *link)