More fixes for new PCMCIA stuff

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

12 files changed, 13 insertions, 9 deletions

diff --git a/configure.in b/configure.in
index ad79644cd..4e45c91f1 100644
--- a/configure.in
+++ b/configure.in
@@ -701,6 +701,7 @@ rm -f include/linux/*.h
 rm -rf include/linux/usb
 rm -rf include/linux/regulator
 rm -f include/asm/*.h
+rm -rf include/pcmcia
 
 
 dnl Directory for modules
@@ -1574,6 +1575,7 @@ CHECK_KERNEL_HEADER(linux/hrtimer.h)
 CHECK_KERNEL_HEADER(linux/gcd.h, [#include \"gcd_compat.h\"
 ])
 CHECK_KERNEL_HEADER(linux/gfp.h)
+CHECK_KERNEL_HEADER(pcmcia/cs_types.h, [#define SND_HAVE_DUMMY_CS_TYPES_H])
 
 dnl Check for dump_stack
 if test "$kversion.$kpatchlevel" = "2.6"; then
diff --git a/pcmcia/pdaudiocf/pdaudiocf-2.6.16.c b/pcmcia/pdaudiocf/pdaudiocf-2.6.16.c
index e8a873296..22d2724a9 100644
--- a/pcmcia/pdaudiocf/pdaudiocf-2.6.16.c
+++ b/pcmcia/pdaudiocf/pdaudiocf-2.6.16.c
@@ -18,7 +18,6 @@
  *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
  */
 
-#include "adriver.h"
 #include <sound/core.h>
 #include <linux/slab.h>
 #include <linux/moduleparam.h>
diff --git a/pcmcia/pdaudiocf/pdaudiocf.c b/pcmcia/pdaudiocf/pdaudiocf.c
index e7547e583..fa8417466 100644
--- a/pcmcia/pdaudiocf/pdaudiocf.c
+++ b/pcmcia/pdaudiocf/pdaudiocf.c
@@ -1,4 +1,6 @@
 #include "alsa-autoconf.h"
+#include "adriver.h"
+#include <pcmcia/cs_types.h>
 
 #if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,15)
 #include "pdaudiocf_old.c"
@@ -6,10 +8,9 @@
 #include "pdaudiocf-2.6.16.c"
 #elif LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,34)
 #include "pdaudiocf-2.6.34.c"
-#elif LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,35)
+#elif !defined(SND_HAVE_DUMMY_CS_TYPES_H)
 #include "pdaudiocf-2.6.35.c"
 #else
-#include "adriver.h"
 #include "../../alsa-kernel/pcmcia/pdaudiocf/pdaudiocf.c"
 #endif
 
diff --git a/pcmcia/pdaudiocf/pdaudiocf.h b/pcmcia/pdaudiocf/pdaudiocf.h
index ae0267047..bf38482e1 100644
--- a/pcmcia/pdaudiocf/pdaudiocf.h
+++ b/pcmcia/pdaudiocf/pdaudiocf.h
@@ -1,4 +1,4 @@
-#if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 35)
+#ifdef SND_HAVE_DUMMY_CS_TYPES_H
 #include "../../alsa-kernel/pcmcia/pdaudiocf/pdaudiocf.h"
 #elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 35)
 #include "pdaudiocf-2.6.35.h"
diff --git a/pcmcia/pdaudiocf/pdaudiocf_core.c b/pcmcia/pdaudiocf/pdaudiocf_core.c
index b7f8d2ff5..51b4c3f1e 100644
--- a/pcmcia/pdaudiocf/pdaudiocf_core.c
+++ b/pcmcia/pdaudiocf/pdaudiocf_core.c
@@ -1,4 +1,5 @@
 #define __NO_VERSION__
 #include "adriver.h"
+#include <pcmcida/cs_types.h>
 #include "../../alsa-kernel/pcmcia/pdaudiocf/pdaudiocf_core.c"
 EXPORT_NO_SYMBOLS;
diff --git a/pcmcia/pdaudiocf/pdaudiocf_irq.c b/pcmcia/pdaudiocf/pdaudiocf_irq.c
index e0d90e0f6..e1ee0716b 100644
--- a/pcmcia/pdaudiocf/pdaudiocf_irq.c
+++ b/pcmcia/pdaudiocf/pdaudiocf_irq.c
@@ -1,4 +1,5 @@
 #define __NO_VERSION__
 #include "adriver.h"
+#include <pcmcida/cs_types.h>
 #include "../../alsa-kernel/pcmcia/pdaudiocf/pdaudiocf_irq.c"
 EXPORT_NO_SYMBOLS;
diff --git a/pcmcia/pdaudiocf/pdaudiocf_old.c b/pcmcia/pdaudiocf/pdaudiocf_old.c
index a797399a6..d26ac4a75 100644
--- a/pcmcia/pdaudiocf/pdaudiocf_old.c
+++ b/pcmcia/pdaudiocf/pdaudiocf_old.c
@@ -22,7 +22,6 @@
  *  please copy pdacf.conf to /etc/pcmcia directory
  */
 
-#include "adriver.h"
 #include <sound/core.h>
 #include <linux/slab.h>
 #include <linux/moduleparam.h>
diff --git a/pcmcia/vx/vxp_mixer.c b/pcmcia/vx/vxp_mixer.c
index 731c30ffd..cdb35628a 100644
--- a/pcmcia/vx/vxp_mixer.c
+++ b/pcmcia/vx/vxp_mixer.c
@@ -1,3 +1,4 @@
 #define __NO_VERSION__
 #include "adriver.h"
+#include <pcmcida/cs_types.h>
 #include "../../alsa-kernel/pcmcia/vx/vxp_mixer.c"
diff --git a/pcmcia/vx/vxp_ops.c b/pcmcia/vx/vxp_ops.c
index 4b8c1f0ab..55531a6de 100644
--- a/pcmcia/vx/vxp_ops.c
+++ b/pcmcia/vx/vxp_ops.c
@@ -1,3 +1,4 @@
 #define __NO_VERSION__
 #include "adriver.h"
+#include <pcmcida/cs_types.h>
 #include "../../alsa-kernel/pcmcia/vx/vxp_ops.c"
diff --git a/pcmcia/vx/vxpocket-2.6.16.c b/pcmcia/vx/vxpocket-2.6.16.c
index 1ecf9f05e..ff95684fb 100644
--- a/pcmcia/vx/vxpocket-2.6.16.c
+++ b/pcmcia/vx/vxpocket-2.6.16.c
@@ -19,7 +19,6 @@
  */
 
 
-#include "adriver.h"
 #include <linux/init.h>
 #include <linux/moduleparam.h>
 #include <sound/core.h>
diff --git a/pcmcia/vx/vxpocket.c b/pcmcia/vx/vxpocket.c
index 6efc6eee1..87f391976 100644
--- a/pcmcia/vx/vxpocket.c
+++ b/pcmcia/vx/vxpocket.c
@@ -1,4 +1,6 @@
 #include "alsa-autoconf.h"
+#include "adriver.h"
+#include <pcmcia/cs_types.h>
 
 #if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,15)
 #include "vxpocket_old.c"
@@ -6,10 +8,9 @@
 #include "vxpocket-2.6.16.c"
 #elif LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,34)
 #include "vxpocket-2.6.34.c"
-#elif LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,35)
+#elif !defined(SND_HAVE_DUMMY_CS_TYPES_H)
 #include "vxpocket-2.6.35.c"
 #else
-#include "adriver.h"
 #include "../../alsa-kernel/pcmcia/vx/vxpocket.c"
 #endif
 
diff --git a/pcmcia/vx/vxpocket_old.c b/pcmcia/vx/vxpocket_old.c
index 8dbad884d..74cf365bc 100644
--- a/pcmcia/vx/vxpocket_old.c
+++ b/pcmcia/vx/vxpocket_old.c
@@ -20,7 +20,6 @@
  */
 
 
-#include "adriver.h"
 #include <linux/init.h>
 #include <linux/moduleparam.h>
 #include <sound/core.h>