diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-02-23 17:49:35 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-02-23 17:49:35 +0100 |
| commit | 867731893c9ebdb6f5d810b8ea18d8ce68f9c958 (patch) | |
| tree | bfe12a6866fd4e882ed908d41a16f9503da6aad6 | |
| parent | e1426b6097b3b61c6895b492badfd176a8f74984 (diff) | |
| download | alsa-driver-build-unstable-867731893c9ebdb6f5d810b8ea18d8ce68f9c958.tar.gz | |
More fixes for build errors after usb v2.0 merge
Signed-off-by: Takashi Iwai <tiwai@suse.de>
| -rw-r--r-- | configure.in | 2 | ||||
| -rw-r--r-- | usb/usbaudio.inc | 13 |
2 files changed, 15 insertions, 0 deletions
diff --git a/configure.in b/configure.in index affae73f5..edb3fe904 100644 --- a/configure.in +++ b/configure.in @@ -2810,6 +2810,8 @@ if test -n "$CONFIG_USB"; then echo "Creating <linux/usb/audio.h>..." echo "#include \"usb_audio_compat.h\"" > include/linux/usb/audio.h fi + + CHECK_KERNEL_HEADER(linux/usb/ch9.h) fi dnl class_simple for old 2.6 kernels diff --git a/usb/usbaudio.inc b/usb/usbaudio.inc index 89eb98c2d..68d5c2258 100644 --- a/usb/usbaudio.inc +++ b/usb/usbaudio.inc @@ -19,6 +19,7 @@ #include "adriver.h" #include "usbcompat.h" #include <linux/usb.h> +#include <linux/usb/ch9.h> #ifndef USB_DT_CS_DEVICE #define USB_DT_CS_DEVICE 0x21 @@ -35,4 +36,16 @@ static void usb_audio_disconnect(struct usb_device *dev, void *ptr); static int usb_reset_configuration(struct usb_device *dev); #endif +#ifndef USB_ENDPOINT_SYNCTYPE +#define USB_ENDPOINT_SYNCTYPE 0x0c +#define USB_ENDPOINT_SYNC_NONE (0 << 2) +#define USB_ENDPOINT_SYNC_ASYNC (1 << 2) +#define USB_ENDPOINT_SYNC_ADAPTIVE (2 << 2) +#define USB_ENDPOINT_SYNC_SYNC (3 << 2) +#endif + +#ifndef USB_SUBCLASS_VENDOR_SPEC +#define USB_SUBCLASS_VENDOR_SPEC 0xff +#endif + // vim: ft=c |