From d6e4a2ba328962fd72414299f84b24ffab469fab Mon Sep 17 00:00:00 2001
From: H Hartley Sweeten <hartleys@visionengravers.com>
Date: Mon, 2 Jul 2012 15:46:40 -0700
Subject: [PATCH] --- yaml --- r: 317697 b: refs/heads/master c:
 eb97e08e04048d47d5a16a9c6428cda5dda8c4f1 h: refs/heads/master i:   317695:
 6bd2b170740df4dedf9eb2c551d47968da4f00eb v: v3

---
 [refs]                                          |  2 +-
 trunk/drivers/staging/comedi/drivers/das08_cs.c | 12 ------------
 2 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/[refs] b/[refs]
index a587ad617f4a..d740a692e66a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 44378f65f1b528d3a368a515598e44a73a9c3a76
+refs/heads/master: eb97e08e04048d47d5a16a9c6428cda5dda8c4f1
diff --git a/trunk/drivers/staging/comedi/drivers/das08_cs.c b/trunk/drivers/staging/comedi/drivers/das08_cs.c
index 044c5860421b..b7efcb4f4239 100644
--- a/trunk/drivers/staging/comedi/drivers/das08_cs.c
+++ b/trunk/drivers/staging/comedi/drivers/das08_cs.c
@@ -184,16 +184,6 @@ static void das08_pcmcia_detach(struct pcmcia_device *link)
 
 }
 
-static int das08_pcmcia_suspend(struct pcmcia_device *link)
-{
-	return 0;
-}
-
-static int das08_pcmcia_resume(struct pcmcia_device *link)
-{
-	return 0;
-}
-
 static const struct pcmcia_device_id das08_cs_id_table[] = {
 	PCMCIA_DEVICE_MANF_CARD(0x01c5, 0x4001),
 	PCMCIA_DEVICE_NULL
@@ -205,8 +195,6 @@ static struct pcmcia_driver das08_cs_driver = {
 	.owner		= THIS_MODULE,
 	.probe		= das08_pcmcia_attach,
 	.remove		= das08_pcmcia_detach,
-	.suspend	= das08_pcmcia_suspend,
-	.resume		= das08_pcmcia_resume,
 	.id_table	= das08_cs_id_table,
 };