From 71ff7e0144bc37b51e8c361ff2f3eaa5ec51f3d2 Mon Sep 17 00:00:00 2001
From: H Hartley Sweeten <hartleys@visionengravers.com>
Date: Fri, 25 Jan 2013 18:35:22 -0700
Subject: [PATCH] --- yaml --- r: 354252 b: refs/heads/master c:
 098303caaf3a24e43a67d9a6e7d2f7d3033a601f h: refs/heads/master v: v3

---
 [refs]                                            |  2 +-
 .../drivers/staging/comedi/drivers/ni_labpc_cs.c  | 15 +++++++--------
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index 98dbacec7d5b..e78d1d0d306e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3e6c183306009b62c8de6e0d439ae61e7af22bc0
+refs/heads/master: 098303caaf3a24e43a67d9a6e7d2f7d3033a601f
diff --git a/trunk/drivers/staging/comedi/drivers/ni_labpc_cs.c b/trunk/drivers/staging/comedi/drivers/ni_labpc_cs.c
index 7d9fce914d00..f2c7ab62a1c5 100644
--- a/trunk/drivers/staging/comedi/drivers/ni_labpc_cs.c
+++ b/trunk/drivers/staging/comedi/drivers/ni_labpc_cs.c
@@ -266,17 +266,16 @@ static const struct pcmcia_device_id labpc_cs_ids[] = {
 	PCMCIA_DEVICE_MANF_CARD(0x010b, 0x0103),	/* daqcard-1200 */
 	PCMCIA_DEVICE_NULL
 };
-
 MODULE_DEVICE_TABLE(pcmcia, labpc_cs_ids);
 
 static struct pcmcia_driver labpc_cs_driver = {
-	.probe = labpc_cs_attach,
-	.remove = labpc_cs_detach,
-	.suspend = labpc_cs_suspend,
-	.resume = labpc_cs_resume,
-	.id_table = labpc_cs_ids,
-	.owner = THIS_MODULE,
-	.name = "daqcard-1200",
+	.name		= "daqcard-1200",
+	.owner		= THIS_MODULE,
+	.id_table	= labpc_cs_ids,
+	.probe		= labpc_cs_attach,
+	.remove		= labpc_cs_detach,
+	.suspend	= labpc_cs_suspend,
+	.resume		= labpc_cs_resume,
 };
 module_comedi_pcmcia_driver(driver_labpc_cs, labpc_cs_driver);