diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-05-10 09:53:21 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-05-10 09:53:21 +0200 |
| commit | 53a89f50d2434e2a75ad76b34bab1cd309adb38d (patch) | |
| tree | 812eeb0af580429694fae9e858abdaabacfb3cef | |
| parent | 2aa3f554ee4c50b263f4cc5494a10136e374bef9 (diff) | |
| download | alsa-driver-build-unstable-53a89f50d2434e2a75ad76b34bab1cd309adb38d.tar.gz | |
ALSA: Merge es968 into es1688 driver
Signed-off-by: Takashi Iwai <tiwai@suse.de>
| -rw-r--r-- | isa/es1688/Makefile | 1 | ||||
| -rw-r--r-- | isa/es1688/es1688.c | 5 | ||||
| -rw-r--r-- | isa/sb/Makefile | 2 | ||||
| -rw-r--r-- | isa/sb/es968.c | 8 |
4 files changed, 7 insertions, 9 deletions
diff --git a/isa/es1688/Makefile b/isa/es1688/Makefile index 38b2745c6..a3d02cb18 100644 --- a/isa/es1688/Makefile +++ b/isa/es1688/Makefile @@ -6,6 +6,7 @@ include $(SND_TOPDIR)/toplevel.config include $(SND_TOPDIR)/Makefile.conf export-objs := es1688_lib.o +isapnp-files := es1688.isapnp include $(SND_TOPDIR)/alsa-kernel/isa/es1688/Makefile diff --git a/isa/es1688/es1688.c b/isa/es1688/es1688.c index 454b1bf62..0f4300898 100644 --- a/isa/es1688/es1688.c +++ b/isa/es1688/es1688.c @@ -1,3 +1,8 @@ #include "adriver.h" #include "../../alsa-kernel/isa/es1688/es1688.c" +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0) +#ifndef __isapnp_now__ +#include "es1688.isapnp" +#endif EXPORT_NO_SYMBOLS; +#endif diff --git a/isa/sb/Makefile b/isa/sb/Makefile index 2965ff4b3..772626ff7 100644 --- a/isa/sb/Makefile +++ b/isa/sb/Makefile @@ -7,7 +7,7 @@ include $(SND_TOPDIR)/Makefile.conf export-objs := emu8000.o sb_common.o sb8_main.o sb16_main.o sb16_csp.o -isapnp-files := es968.isapnp sb16.isapnp sbawe.isapnp +isapnp-files := sb16.isapnp sbawe.isapnp clean-files := sb16_csp.c diff --git a/isa/sb/es968.c b/isa/sb/es968.c deleted file mode 100644 index 4af67e82c..000000000 --- a/isa/sb/es968.c +++ /dev/null @@ -1,8 +0,0 @@ -#include "adriver.h" -#include "../../alsa-kernel/isa/sb/es968.c" -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0) -#ifndef __isapnp_now__ -#include "es968.isapnp" -#endif -EXPORT_NO_SYMBOLS; -#endif |