diff --git a/[refs] b/[refs]
index 66ac1a3c9432..744cdc9e5a6c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c8b2ae2b98bad7870ec6be24e517bacffd76ea8e
+refs/heads/master: 2b5f548082d8b6442a4a76ff92276c4606441ada
diff --git a/trunk/drivers/staging/comedi/drivers/cb_das16_cs.c b/trunk/drivers/staging/comedi/drivers/cb_das16_cs.c
index 151a55985454..df9b075cdc8a 100644
--- a/trunk/drivers/staging/comedi/drivers/cb_das16_cs.c
+++ b/trunk/drivers/staging/comedi/drivers/cb_das16_cs.c
@@ -679,16 +679,6 @@ static void das16cs_pcmcia_detach(struct pcmcia_device *link)
 	cur_dev = NULL;
 }
 
-static int das16cs_pcmcia_suspend(struct pcmcia_device *link)
-{
-	return 0;
-}
-
-static int das16cs_pcmcia_resume(struct pcmcia_device *link)
-{
-	return 0;
-}
-
 static const struct pcmcia_device_id das16cs_id_table[] = {
 	PCMCIA_DEVICE_MANF_CARD(0x01c5, 0x0039),
 	PCMCIA_DEVICE_MANF_CARD(0x01c5, 0x4009),
@@ -701,8 +691,6 @@ static struct pcmcia_driver das16cs_driver = {
 	.owner		= THIS_MODULE,
 	.probe		= das16cs_pcmcia_attach,
 	.remove		= das16cs_pcmcia_detach,
-	.suspend	= das16cs_pcmcia_suspend,
-	.resume		= das16cs_pcmcia_resume,
 	.id_table	= das16cs_id_table,
 };