summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2006-05-31 15:29:04 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2006-05-31 15:29:04 +0000
commit44a2f3c37f7aec4df45e4c1b65c472a1965e08da (patch)
treed8f06f90bdecd12773bf56924ba746fa8c22c516
parent63de79348557132cda3626a3bfc2c5be52b2a9fa (diff)
fix alsa compile error (backport from buildroot-ng)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@3863 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--openwrt/target/linux/package/alsa/patches/100-compile_fix.patch18
1 files changed, 18 insertions, 0 deletions
diff --git a/openwrt/target/linux/package/alsa/patches/100-compile_fix.patch b/openwrt/target/linux/package/alsa/patches/100-compile_fix.patch
new file mode 100644
index 0000000000..2e2a3df79a
--- /dev/null
+++ b/openwrt/target/linux/package/alsa/patches/100-compile_fix.patch
@@ -0,0 +1,18 @@
+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 */