diff options
| author | Jaroslav Kysela <perex@perex.cz> | 2010-05-11 10:29:23 +0200 |
|---|---|---|
| committer | Jaroslav Kysela <perex@perex.cz> | 2010-05-11 10:29:23 +0200 |
| commit | aaf8537d942cb5d7979ca3b15d899cd84357e9c3 (patch) | |
| tree | 031202d57807f25ea9691616cc2f039207e130f8 | |
| parent | 41c33e6bb5ce2858b8b525362d0e6ea2ad06fdab (diff) | |
| parent | c664975c0ad36673ed8e438e5e7c60c5771938a0 (diff) | |
| download | alsa-driver-build-unstable-aaf8537d942cb5d7979ca3b15d899cd84357e9c3.tar.gz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/alsa-driver-build
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | include/adriver.h | 10 | ||||
| -rw-r--r-- | include/usb_audio_compat.h | 2 | ||||
| -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 | ||||
| -rw-r--r-- | kconfig-vers | 2 |
8 files changed, 14 insertions, 17 deletions
diff --git a/.gitignore b/.gitignore index f42d5d89d..bc27469dd 100644 --- a/.gitignore +++ b/.gitignore @@ -27,6 +27,7 @@ alsa-kernel scripts linux sound +*.isapnp acore/control.c acore/hrtimer.c diff --git a/include/adriver.h b/include/adriver.h index 3b8f54605..83fe7ee2a 100644 --- a/include/adriver.h +++ b/include/adriver.h @@ -24,11 +24,6 @@ #include "config.h" -/* hack - CONFIG_SND_HDA_INPUT_JACK can be wrongly set for older kernels */ -#ifndef CONFIG_SND_JACK -#undef CONFIG_SND_HDA_INPUT_JACK -#endif - /* number of supported soundcards */ #ifdef CONFIG_SND_DYNAMIC_MINORS #define SNDRV_CARDS 32 @@ -2011,4 +2006,9 @@ blocking_notifier_chain_unregister(struct blocking_notifier_head *nh, #define nonseekable_open(i,f) 0 #endif +/* hack - CONFIG_SND_HDA_INPUT_JACK can be wrongly set for older kernels */ +#ifndef CONFIG_SND_JACK +#undef CONFIG_SND_HDA_INPUT_JACK +#endif + #endif /* __SOUND_LOCAL_DRIVER_H */ diff --git a/include/usb_audio_compat.h b/include/usb_audio_compat.h index 905a87caf..57f205519 100644 --- a/include/usb_audio_compat.h +++ b/include/usb_audio_compat.h @@ -244,7 +244,7 @@ struct uac_selector_unit_descriptor { static inline __u8 uac_selector_unit_iSelector(struct uac_selector_unit_descriptor *desc) { __u8 *raw = (__u8 *) desc; - return raw[desc->bLength - 1]; + return raw[9 + desc->bLength - 1]; } /* 4.3.2.5 Feature Unit Descriptor */ 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 diff --git a/kconfig-vers b/kconfig-vers index 1cebb91c2..1e2a97cfd 100644 --- a/kconfig-vers +++ b/kconfig-vers @@ -22,5 +22,3 @@ SND_JACK 2.6.27 SND_FM801_TEA575X_BOOL 2.6.27 SND_USB_UA101 2.6.32 SND_LX6464ES 2.6 -SND_ES1968_INPUT 2.6.22 -SND_MAESTRO3_INPUT 2.6.22 |