diff --git a/[refs] b/[refs]
index ceeb8fcd1cd6..676c67427af3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0bfc02b8e58abcc0c1f03638a34650c3eaee36f9
+refs/heads/master: 7044ae812bd0c3a483d860efd6fd2f0e2ff5d22b
diff --git a/trunk/drivers/staging/comedi/drivers/ni_daq_dio24.c b/trunk/drivers/staging/comedi/drivers/ni_daq_dio24.c
index 51c25ac0dcae..4cdf928ffb7c 100644
--- a/trunk/drivers/staging/comedi/drivers/ni_daq_dio24.c
+++ b/trunk/drivers/staging/comedi/drivers/ni_daq_dio24.c
@@ -261,18 +261,6 @@ static void dio24_config(struct pcmcia_device *link)
 	pcmcia_disable_device(link);
 }
 
-static int dio24_cs_suspend(struct pcmcia_device *link)
-{
-	return 0;
-}				/* dio24_cs_suspend */
-
-static int dio24_cs_resume(struct pcmcia_device *link)
-{
-	return 0;
-}				/* dio24_cs_resume */
-
-/*====================================================================*/
-
 static const struct pcmcia_device_id dio24_cs_ids[] = {
 	/* N.B. These IDs should match those in dio24_boards */
 	PCMCIA_DEVICE_MANF_CARD(0x010b, 0x475c),	/* daqcard-dio24 */
@@ -286,8 +274,6 @@ static struct pcmcia_driver dio24_cs_driver = {
 	.id_table	= dio24_cs_ids,
 	.probe		= dio24_cs_attach,
 	.remove		= dio24_cs_detach,
-	.suspend	= dio24_cs_suspend,
-	.resume		= dio24_cs_resume,
 };
 module_comedi_pcmcia_driver(driver_dio24, dio24_cs_driver);