--- usbaudio.c 2003-06-01 20:32:24.000000000 +0200 +++ usbaudio.c.old 2003-06-01 20:32:42.000000000 +0200 @@ -1,3 +1,4 @@ +#include "usbaudio.inc" /* * (Tentative) USB Audio Driver for ALSA * @@ -1656,9 +1657,11 @@ * entry point for linux usb interface */ +#ifndef OLD_USB static int usb_audio_probe(struct usb_interface *intf, const struct usb_device_id *id); static void usb_audio_disconnect(struct usb_interface *intf); +#endif static struct usb_device_id usb_audio_ids [] = { #include "usbquirks.h" @@ -1671,10 +1674,15 @@ MODULE_DEVICE_TABLE (usb, usb_audio_ids); static struct usb_driver usb_audio_driver = { +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 5, 70) /* FIXME: find right number */ .owner = THIS_MODULE, +#endif .name = "snd-usb-audio", .probe = usb_audio_probe, .disconnect = usb_audio_disconnect, +#ifdef OLD_USB + .driver_list = LIST_HEAD_INIT(usb_audio_driver.driver_list), +#endif .id_table = usb_audio_ids, }; @@ -2744,6 +2752,7 @@ } } +#ifndef OLD_USB /* * new 2.5 USB kernel API */ @@ -2764,6 +2773,8 @@ snd_usb_audio_disconnect(interface_to_usbdev(intf), dev_get_drvdata(&intf->dev)); } +#endif + static int __init snd_usb_audio_init(void) @@ -2803,3 +2814,5 @@ __setup("snd-usb-audio=", snd_usb_audio_module_setup); #endif /* !MODULE */ + +#include "usbaudio.inc1"