diff -urN alsa.old/include/adriver.h alsa.dev/include/adriver.h
--- alsa.old/include/adriver.h	2006-04-19 08:24:30.000000000 +0200
+++ alsa.dev/include/adriver.h	2006-05-31 17:24:49.000000000 +0200
@@ -451,7 +451,7 @@
 #endif /* < 2.6.0 */
 
 /* workarounds for USB API */
-#if defined(SND_NEED_USB_WRAPPER) && (defined(CONFIG_USB) || defined(CONFIG_USB_MODULE))
+#if 1
 
 #include <linux/usb.h>
 
@@ -1174,4 +1174,5 @@
  */
 #define OPL3_HW_OPL3_PC98	0x0305	/* PC9800 */
 
+#undef info /* used in several structs */
 #endif /* __SOUND_LOCAL_DRIVER_H */