From: Ian Abbott <abbotti@mev.co.uk>
Date: Fri, 8 Oct 2010 09:59:20 +0000 (+0000)
Subject: I messed up the #ifdefs on the previous commit.  Sorry!
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=1d66dd381dca4354c3636b32eacfe0d9b98f09d4;p=comedi.git

I messed up the #ifdefs on the previous commit.  Sorry!
---

diff --git a/comedi/drivers/cb_das16_cs.c b/comedi/drivers/cb_das16_cs.c
index 3e36fb46..bd27585f 100644
--- a/comedi/drivers/cb_das16_cs.c
+++ b/comedi/drivers/cb_das16_cs.c
@@ -194,7 +194,7 @@ static int das16cs_attach(comedi_device * dev, comedi_devconfig * it)
 	printk("\n");
 
 	ret = comedi_request_irq(
-#ifdef COMEDI_HAVE_CS_IRQ_REQ_T
+#ifdef CONFIG_COMEDI_HAVE_CS_IRQ_REQ_T
 		link->irq.AssignedIRQ,
 #else
 		link->irq,
@@ -204,7 +204,7 @@ static int das16cs_attach(comedi_device * dev, comedi_devconfig * it)
 	if (ret < 0) {
 		return ret;
 	}
-#ifdef COMEDI_HAVE_CS_IRQ_REQ_T
+#ifdef CONFIG_COMEDI_HAVE_CS_IRQ_REQ_T
 	dev->irq = link->irq.AssignedIRQ;
 #else
 	dev->irq = link->irq;
@@ -703,7 +703,7 @@ static dev_info_t dev_info = "cb_das16_cs";
 
 typedef struct local_info_t {
 	struct pcmcia_device *link;
-#ifdef COMEDI_HAVE_DS_DEV_NODE_T
+#ifdef CONFIG_COMEDI_HAVE_DS_DEV_NODE_T
 	dev_node_t node;
 #endif
 	int stop;
@@ -933,7 +933,7 @@ static void das16cs_pcmcia_config(struct pcmcia_device *link)
 	}
 #endif
 
-#ifdef COMEDI_HAVE_CS_IRQ_REQ_T
+#ifdef CONFIG_COMEDI_HAVE_CS_IRQ_REQ_T
 	/*
 	   Allocate an interrupt line.  Note that this does not assign a
 	   handler to the interrupt, unless the 'Handler' member of the
diff --git a/comedi/drivers/das08_cs.c b/comedi/drivers/das08_cs.c
index f72df3ea..9f8110b7 100644
--- a/comedi/drivers/das08_cs.c
+++ b/comedi/drivers/das08_cs.c
@@ -159,7 +159,7 @@ static const dev_info_t dev_info = "pcm-das08";
 
 typedef struct local_info_t {
 	struct pcmcia_device *link;
-#ifdef COMEDI_HAVE_DS_DEV_NODE_T
+#ifdef CONFIG_COMEDI_HAVE_DS_DEV_NODE_T
 	dev_node_t node;
 #endif
 	int stop;
@@ -414,7 +414,7 @@ static void das08_pcmcia_config(struct pcmcia_device *link)
 	}
 #endif
 
-#ifdef COMEDI_HAVE_CS_IRQ_REQ_T
+#ifdef CONFIG_COMEDI_HAVE_CS_IRQ_REQ_T
 	if (link->conf.Attributes & CONF_ENABLE_IRQ) {
 #ifndef CONFIG_COMEDI_HAVE_PCMCIA_LOOP_TUPLE
 		last_fn = RequestIRQ;
diff --git a/comedi/drivers/ni_daq_700.c b/comedi/drivers/ni_daq_700.c
index 29701b85..9e2d9fcc 100644
--- a/comedi/drivers/ni_daq_700.c
+++ b/comedi/drivers/ni_daq_700.c
@@ -372,7 +372,7 @@ static int dio700_attach(comedi_device * dev, comedi_devconfig * it)
 			return -EIO;
 		iobase = link->io.BasePort1;
 #ifdef incomplete
-#ifdef COMEDI_HAVE_CS_IRQ_REQ_T
+#ifdef CONFIG_COMEDI_HAVE_CS_IRQ_REQ_T
 		irq = link->irq.AssignedIRQ;
 #else
 		irq = link->irq;
@@ -484,7 +484,7 @@ static const dev_info_t dev_info = "ni_daq_700";
 
 typedef struct local_info_t {
 	struct pcmcia_device *link;
-#ifdef COMEDI_HAVE_DS_DEV_NODE_T
+#ifdef CONFIG_COMEDI_HAVE_DS_DEV_NODE_T
 	dev_node_t node;
 #endif
 	int stop;
@@ -798,7 +798,7 @@ static void dio700_config(struct pcmcia_device *link)
 	}
 #endif
 
-#ifdef COMEDI_HAVE_CS_IRQ_REQ_T
+#ifdef CONFIG_COMEDI_HAVE_CS_IRQ_REQ_T
 	/*
 	   Allocate an interrupt line.  Note that this does not assign a
 	   handler to the interrupt, unless the 'Handler' member of the
diff --git a/comedi/drivers/ni_daq_dio24.c b/comedi/drivers/ni_daq_dio24.c
index 41e97845..ca7b37bc 100644
--- a/comedi/drivers/ni_daq_dio24.c
+++ b/comedi/drivers/ni_daq_dio24.c
@@ -241,7 +241,7 @@ static const dev_info_t dev_info = "ni_daq_dio24";
 
 typedef struct local_info_t {
 	struct pcmcia_device *link;
-#ifdef COMEDI_HAVE_DS_DEV_NODE_T
+#ifdef CONFIG_COMEDI_HAVE_DS_DEV_NODE_T
 	dev_node_t node;
 #endif
 	int stop;
@@ -555,7 +555,7 @@ static void dio24_config(struct pcmcia_device *link)
 	}
 #endif
 
-#ifdef COMEDI_HAVE_CS_IRQ_REQ_T
+#ifdef CONFIG_COMEDI_HAVE_CS_IRQ_REQ_T
 	/*
 	   Allocate an interrupt line.  Note that this does not assign a
 	   handler to the interrupt, unless the 'Handler' member of the
diff --git a/comedi/drivers/ni_labpc_cs.c b/comedi/drivers/ni_labpc_cs.c
index ab250e93..1740e3e2 100644
--- a/comedi/drivers/ni_labpc_cs.c
+++ b/comedi/drivers/ni_labpc_cs.c
@@ -220,7 +220,7 @@ static const dev_info_t dev_info = "daqcard-1200";
 
 typedef struct local_info_t {
 	struct pcmcia_device *link;
-#ifdef COMEDI_HAVE_DS_DEV_NODE_T
+#ifdef CONFIG_COMEDI_HAVE_DS_DEV_NODE_T
 	dev_node_t node;
 #endif
 	int stop;
@@ -530,7 +530,7 @@ static void labpc_config(struct pcmcia_device *link)
 	}
 #endif
 
-#ifdef COMEDI_HAVE_CS_IRQ_REQ_T
+#ifdef CONFIG_COMEDI_HAVE_CS_IRQ_REQ_T
 	/*
 	   Allocate an interrupt line.  Note that this does not assign a
 	   handler to the interrupt, unless the 'Handler' member of the
diff --git a/comedi/drivers/ni_mio_cs.c b/comedi/drivers/ni_mio_cs.c
index 58c9d045..e1c567a3 100644
--- a/comedi/drivers/ni_mio_cs.c
+++ b/comedi/drivers/ni_mio_cs.c
@@ -260,7 +260,7 @@ static void cs_detach(struct pcmcia_device *);
 
 static struct pcmcia_device *cur_dev = NULL;
 static const dev_info_t dev_info = "ni_mio_cs";
-#ifdef COMEDI_HAVE_DS_DEV_NODE_T
+#ifdef CONFIG_COMEDI_HAVE_DS_DEV_NODE_T
 static dev_node_t dev_node = {
 	"ni_mio_cs",
 	COMEDI_MAJOR, 0,
@@ -430,7 +430,7 @@ static void mio_cs_config(struct pcmcia_device *link)
 	link->irq.IRQInfo1 = parse.cftable_entry.irq.IRQInfo1;
 	link->irq.IRQInfo2 = parse.cftable_entry.irq.IRQInfo2;
 #endif
-#ifdef COMEDI_HAVE_CS_IRQ_REQ_T
+#ifdef CONFIG_COMEDI_HAVE_CS_IRQ_REQ_T
 	ret = pcmcia_request_irq(link, &link->irq);
 	if (ret) {
 		printk("pcmcia_request_irq() returned error: %i\n", ret);
diff --git a/comedi/drivers/quatech_daqp_cs.c b/comedi/drivers/quatech_daqp_cs.c
index 1e5da6ff..2d92ce9c 100644
--- a/comedi/drivers/quatech_daqp_cs.c
+++ b/comedi/drivers/quatech_daqp_cs.c
@@ -81,7 +81,7 @@ static char *version = "quatech_daqp_cs.c 1.10 2003/04/21 (Brent Baccala)";
 
 typedef struct local_info_t {
 	struct pcmcia_device *link;
-#ifdef COMEDI_HAVE_DS_DEV_NODE_T
+#ifdef CONFIG_COMEDI_HAVE_DS_DEV_NODE_T
 	dev_node_t node;
 #endif
 	int stop;
@@ -1333,14 +1333,14 @@ static void daqp_cs_config(struct pcmcia_device *link)
 	   handler to the interrupt, unless the 'Handler' member of the
 	   irq structure is initialized.
 	 */
-#ifdef COMEDI_HAVE_CS_IRQ_REQ_T
+#ifdef CONFIG_COMEDI_HAVE_CS_IRQ_REQ_T
 	if (link->conf.Attributes & CONF_ENABLE_IRQ)
 #endif
 	{
 #ifndef CONFIG_COMEDI_HAVE_PCMCIA_LOOP_TUPLE
 		last_fn = RequestIRQ;
 #endif
-#ifdef COMEDI_HAVE_CS_IRQ_REQ_T
+#ifdef CONFIG_COMEDI_HAVE_CS_IRQ_REQ_T
 		last_ret = pcmcia_request_irq(link, &link->irq);
 #else
 		last_ret = pcmcia_request_irq(link, daqp_interrupt);