Corrected pcmcia build fixes

Fixed the wrong copies from 2.6.36.
Add inclusion of pcmcia/cs.h in several places.

Signed-off-by: Takashi Iwai <tiwai@suse.de>

6 files changed, 22 insertions, 13 deletions

diff --git a/pcmcia/pdaudiocf/pdaudiocf-2.6.36.c b/pcmcia/pdaudiocf/pdaudiocf-2.6.36.c
index 8cc473369..7ab9174a8 100644
--- a/pcmcia/pdaudiocf/pdaudiocf-2.6.36.c
+++ b/pcmcia/pdaudiocf/pdaudiocf-2.6.36.c
@@ -142,9 +142,10 @@ static int snd_pdacf_probe(struct pcmcia_device *link)
 	link->resource[0]->flags |= IO_DATA_PATH_WIDTH_AUTO;
 	link->resource[0]->end = 16;
 
-	link->config_flags = CONF_ENABLE_IRQ | CONF_ENABLE_PULSE_IRQ;
-	link->config_index = 1;
-	link->config_regs = PRESENT_OPTION;
+	link->conf.Attributes = CONF_ENABLE_IRQ | CONF_ENABLE_PULSE_IRQ;
+	link->conf.IntType = INT_MEMORY_AND_IO;
+	link->conf.ConfigIndex = 1;
+	link->conf.Present = PRESENT_OPTION;
 
 	return pdacf_config(link);
 }
@@ -216,8 +217,7 @@ static int pdacf_config(struct pcmcia_device *link)
 	int ret;
 
 	snd_printdd(KERN_DEBUG "pdacf_config called\n");
-	link->config_index = 0x5;
-	link->config_flags |= CONF_ENABLE_IRQ | CONF_ENABLE_PULSE_IRQ;
+	link->conf.ConfigIndex = 0x5;
 
 	ret = pcmcia_request_io(link);
 	if (ret)
@@ -227,7 +227,7 @@ static int pdacf_config(struct pcmcia_device *link)
 	if (ret)
 		goto failed;
 
-	ret = pcmcia_enable_device(link);
+	ret = pcmcia_request_configuration(link, &link->conf);
 	if (ret)
 		goto failed;
 
@@ -287,7 +287,9 @@ MODULE_DEVICE_TABLE(pcmcia, snd_pdacf_ids);
 
 static struct pcmcia_driver pdacf_cs_driver = {
 	.owner		= THIS_MODULE,
-	.name		= "snd-pdaudiocf",
+	.drv		= {
+		.name	= "snd-pdaudiocf",
+	},
 	.probe		= snd_pdacf_probe,
 	.remove		= snd_pdacf_detach,
 	.id_table	= snd_pdacf_ids,
diff --git a/pcmcia/pdaudiocf/pdaudiocf_irq.c b/pcmcia/pdaudiocf/pdaudiocf_irq.c
index dab954117..78a02ad67 100644
--- a/pcmcia/pdaudiocf/pdaudiocf_irq.c
+++ b/pcmcia/pdaudiocf/pdaudiocf_irq.c
@@ -1,5 +1,6 @@
 #define __NO_VERSION__
 #include "adriver.h"
 #include <pcmcia/cs_types.h>
+#include <pcmcia/cs.h>
 #include "../../alsa-kernel/pcmcia/pdaudiocf/pdaudiocf_irq.c"
 EXPORT_NO_SYMBOLS;
diff --git a/pcmcia/pdaudiocf/pdaudiocf_pcm.c b/pcmcia/pdaudiocf/pdaudiocf_pcm.c
index bcd79a33f..22f5d8422 100644
--- a/pcmcia/pdaudiocf/pdaudiocf_pcm.c
+++ b/pcmcia/pdaudiocf/pdaudiocf_pcm.c
@@ -1,5 +1,6 @@
 #define __NO_VERSION__
 #include "adriver.h"
 #include <pcmcia/cs_types.h>
+#include <pcmcia/cs.h>
 #include "../../alsa-kernel/pcmcia/pdaudiocf/pdaudiocf_pcm.c"
 EXPORT_NO_SYMBOLS;
diff --git a/pcmcia/vx/vxp_mixer.c b/pcmcia/vx/vxp_mixer.c
index a765c7c05..7461ed2f2 100644
--- a/pcmcia/vx/vxp_mixer.c
+++ b/pcmcia/vx/vxp_mixer.c
@@ -1,4 +1,5 @@
 #define __NO_VERSION__
 #include "adriver.h"
 #include <pcmcia/cs_types.h>
+#include <pcmcia/cs.h>
 #include "../../alsa-kernel/pcmcia/vx/vxp_mixer.c"
diff --git a/pcmcia/vx/vxp_ops.c b/pcmcia/vx/vxp_ops.c
index cc89320b8..2c000d787 100644
--- a/pcmcia/vx/vxp_ops.c
+++ b/pcmcia/vx/vxp_ops.c
@@ -1,4 +1,5 @@
 #define __NO_VERSION__
 #include "adriver.h"
 #include <pcmcia/cs_types.h>
+#include <pcmcia/cs.h>
 #include "../../alsa-kernel/pcmcia/vx/vxp_ops.c"
diff --git a/pcmcia/vx/vxpocket-2.6.36.c b/pcmcia/vx/vxpocket-2.6.36.c
index 80000d631..a6edfc3be 100644
--- a/pcmcia/vx/vxpocket-2.6.36.c
+++ b/pcmcia/vx/vxpocket-2.6.36.c
@@ -2,7 +2,7 @@
  * Driver for Digigram VXpocket V2/440 soundcards
  *
  * Copyright (c) 2002 by Takashi Iwai <tiwai@suse.de>
-
+ *
  *   This program is free software; you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
  *   the Free Software Foundation; either version 2 of the License, or
@@ -162,9 +162,10 @@ static int snd_vxpocket_new(struct snd_card *card, int ibl,
 	link->resource[0]->flags |= IO_DATA_PATH_WIDTH_AUTO;
 	link->resource[0]->end = 16;
 
-	link->config_flags |= CONF_ENABLE_IRQ;
-	link->config_index = 1;
-	link->config_regs = PRESENT_OPTION;
+	link->conf.Attributes = CONF_ENABLE_IRQ;
+	link->conf.IntType = INT_MEMORY_AND_IO;
+	link->conf.ConfigIndex = 1;
+	link->conf.Present = PRESENT_OPTION;
 
 	*chip_ret = vxp;
 	return 0;
@@ -233,7 +234,7 @@ static int vxpocket_config(struct pcmcia_device *link)
 	if (ret)
 		goto failed;
 
-	ret = pcmcia_enable_device(link);
+	ret = pcmcia_request_configuration(link, &link->conf);
 	if (ret)
 		goto failed;
 
@@ -358,7 +359,9 @@ MODULE_DEVICE_TABLE(pcmcia, vxp_ids);
 
 static struct pcmcia_driver vxp_cs_driver = {
 	.owner		= THIS_MODULE,
-	.name		= "snd-vxpocket",
+	.drv		= {
+		.name	= "snd-vxpocket",
+	},
 	.probe		= vxpocket_probe,
 	.remove		= vxpocket_detach,
 	.id_table	= vxp_ids,