From 84ad7113e618ff5619a501a2b38a58172c8d445f Mon Sep 17 00:00:00 2001
From: Peter Huewe <peterhuewe@gmx.de>
Date: Mon, 14 Jan 2013 22:00:51 +0100
Subject: [PATCH] --- yaml --- r: 354042 b: refs/heads/master c:
 f3493a973d5e8985e2c61730257ffa43cbabdb09 h: refs/heads/master v: v3

---
 [refs]                                         |  2 +-
 .../staging/comedi/drivers/quatech_daqp_cs.c   | 18 +-----------------
 2 files changed, 2 insertions(+), 18 deletions(-)

diff --git a/[refs] b/[refs]
index 09c05fbcbb25..6c628c7883c0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 235bee772b0fa4cf059c669bcaa733da08b4894c
+refs/heads/master: f3493a973d5e8985e2c61730257ffa43cbabdb09
diff --git a/trunk/drivers/staging/comedi/drivers/quatech_daqp_cs.c b/trunk/drivers/staging/comedi/drivers/quatech_daqp_cs.c
index ef0cdaa7f02e..55d8cc641967 100644
--- a/trunk/drivers/staging/comedi/drivers/quatech_daqp_cs.c
+++ b/trunk/drivers/staging/comedi/drivers/quatech_daqp_cs.c
@@ -1038,9 +1038,6 @@ static int daqp_cs_resume(struct pcmcia_device *link)
 }
 
 /*====================================================================*/
-
-#ifdef MODULE
-
 static const struct pcmcia_device_id daqp_cs_id_table[] = {
 	PCMCIA_DEVICE_MANF_CARD(0x0137, 0x0027),
 	PCMCIA_DEVICE_NULL
@@ -1061,17 +1058,4 @@ static struct pcmcia_driver daqp_cs_driver = {
 	.name = "quatech_daqp_cs",
 };
 
-int __init init_module(void)
-{
-	pcmcia_register_driver(&daqp_cs_driver);
-	comedi_driver_register(&driver_daqp);
-	return 0;
-}
-
-void __exit cleanup_module(void)
-{
-	comedi_driver_unregister(&driver_daqp);
-	pcmcia_unregister_driver(&daqp_cs_driver);
-}
-
-#endif
+module_comedi_pcmcia_driver(driver_daqp, daqp_cs_driver);