diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-11-03 09:21:25 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-11-03 09:21:25 +0100 |
| commit | 9e6ae7ce14e2be710021829810f459e4aaa99d08 (patch) | |
| tree | 14c1437c71fc775fa37ff832f0216570002ff058 | |
| parent | 81d51486cc8dbef26cd818972a510ea91b6e31b4 (diff) | |
| download | alsa-driver-build-unstable-9e6ae7ce14e2be710021829810f459e4aaa99d08.tar.gz | |
Create a dummy pcmcia/cs.h
Signed-off-by: Takashi Iwai <tiwai@suse.de>
| -rw-r--r-- | configure.in | 1 | ||||
| -rw-r--r-- | pcmcia/pdaudiocf/pdaudiocf.h | 4 | ||||
| -rw-r--r-- | pcmcia/pdaudiocf/pdaudiocf_core.c | 1 | ||||
| -rw-r--r-- | pcmcia/vx/vxpocket.h | 4 |
4 files changed, 4 insertions, 6 deletions
diff --git a/configure.in b/configure.in index 82ef3c05a..d33377bd2 100644 --- a/configure.in +++ b/configure.in @@ -1580,6 +1580,7 @@ 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]) +CHECK_KERNEL_HEADER(pcmcia/cs.h, [#define SND_HAVE_DUMMY_CS_H]) dnl Check for dump_stack if test "$kversion.$kpatchlevel" = "2.6"; then diff --git a/pcmcia/pdaudiocf/pdaudiocf.h b/pcmcia/pdaudiocf/pdaudiocf.h index fefd63e82..c9bcd15c1 100644 --- a/pcmcia/pdaudiocf/pdaudiocf.h +++ b/pcmcia/pdaudiocf/pdaudiocf.h @@ -1,7 +1,5 @@ -#ifdef SND_HAVE_DUMMY_CS_TYPES_H -#if LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 36) #include <pcmcia/cs.h> -#endif +#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 d3939d891..706cdcbdb 100644 --- a/pcmcia/pdaudiocf/pdaudiocf_core.c +++ b/pcmcia/pdaudiocf/pdaudiocf_core.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_core.c" EXPORT_NO_SYMBOLS; diff --git a/pcmcia/vx/vxpocket.h b/pcmcia/vx/vxpocket.h index ea1de5d98..e5edf2a12 100644 --- a/pcmcia/vx/vxpocket.h +++ b/pcmcia/vx/vxpocket.h @@ -1,7 +1,5 @@ -#if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 35) -#if LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 36) #include <pcmcia/cs.h> -#endif +#if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 35) #include "../../alsa-kernel/pcmcia/vx/vxpocket.h" #elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 35) #include "vxpocket-2.6.35.h" |