summaryrefslogtreecommitdiffstats
path: root/package/alsa
diff options
context:
space:
mode:
Diffstat (limited to 'package/alsa')
-rw-r--r--package/alsa/patches/100-compile_fix.patch15
-rw-r--r--package/alsa/patches/110-cp_command.patch9
2 files changed, 13 insertions, 11 deletions
diff --git a/package/alsa/patches/100-compile_fix.patch b/package/alsa/patches/100-compile_fix.patch
index 2e2a3df79..edc15fea8 100644
--- a/package/alsa/patches/100-compile_fix.patch
+++ b/package/alsa/patches/100-compile_fix.patch
@@ -1,7 +1,8 @@
-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 @@
+Index: alsa-driver-1.0.14rc1/include/adriver.h
+===================================================================
+--- alsa-driver-1.0.14rc1.orig/include/adriver.h 2007-06-04 13:22:44.887031416 +0200
++++ alsa-driver-1.0.14rc1/include/adriver.h 2007-06-04 13:22:44.956020928 +0200
+@@ -514,7 +514,7 @@
#endif /* < 2.6.0 */
/* workarounds for USB API */
@@ -10,9 +11,9 @@ diff -urN alsa.old/include/adriver.h alsa.dev/include/adriver.h
#include <linux/usb.h>
-@@ -1174,4 +1174,5 @@
- */
- #define OPL3_HW_OPL3_PC98 0x0305 /* PC9800 */
+@@ -1360,4 +1360,5 @@
+ #endif
+ #endif
+#undef info /* used in several structs */
#endif /* __SOUND_LOCAL_DRIVER_H */
diff --git a/package/alsa/patches/110-cp_command.patch b/package/alsa/patches/110-cp_command.patch
index 4684f9edd..f9719b574 100644
--- a/package/alsa/patches/110-cp_command.patch
+++ b/package/alsa/patches/110-cp_command.patch
@@ -1,7 +1,8 @@
-diff -ruN alsa-driver-1.0.14rc1-old/Makefile alsa-driver-1.0.14rc1-new/Makefile
---- alsa-driver-1.0.14rc1-old/Makefile 2006-12-15 16:23:38.000000000 +0100
-+++ alsa-driver-1.0.14rc1-new/Makefile 2006-12-15 16:24:57.000000000 +0100
-@@ -116,7 +116,7 @@
+Index: alsa-driver-1.0.14rc1/Makefile
+===================================================================
+--- alsa-driver-1.0.14rc1.orig/Makefile 2007-06-04 13:22:44.865034760 +0200
++++ alsa-driver-1.0.14rc1/Makefile 2007-06-04 13:22:45.149991440 +0200
+@@ -115,7 +115,7 @@
if [ ! -d include/sound -a ! -L include/sound ]; then \
ln -sf ../alsa-kernel/include include/sound ; \
fi