|
Revision 468, 0.7 kB
(checked in by tg, 2 years ago)
|
fix namespace pollution by linux/usb.h
while here, switch to update-patches ;)
|
| Line | |
|---|
| 1 |
$FreeWRT$ |
|---|
| 2 |
--- alsa-driver-1.0.11.orig/include/adriver.h Wed Apr 19 06:24:07 2006 |
|---|
| 3 |
+++ alsa-driver-1.0.11/include/adriver.h Sun Jul 30 10:19:18 2006 |
|---|
| 4 |
@@ -451,8 +451,7 @@ static inline void devfs_remove(const ch |
|---|
| 5 |
#endif /* < 2.6.0 */ |
|---|
| 6 |
|
|---|
| 7 |
/* workarounds for USB API */ |
|---|
| 8 |
-#if defined(SND_NEED_USB_WRAPPER) && (defined(CONFIG_USB) || defined(CONFIG_USB_MODULE)) |
|---|
| 9 |
- |
|---|
| 10 |
+#if 1 |
|---|
| 11 |
#include <linux/usb.h> |
|---|
| 12 |
|
|---|
| 13 |
#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 4, 20) |
|---|
| 14 |
@@ -1173,5 +1172,11 @@ static inline int snd_pnp_register_card_ |
|---|
| 15 |
* old defines |
|---|
| 16 |
*/ |
|---|
| 17 |
#define OPL3_HW_OPL3_PC98 0x0305 /* PC9800 */ |
|---|
| 18 |
+ |
|---|
| 19 |
+/* defined by usb.h */ |
|---|
| 20 |
+#undef dbg |
|---|
| 21 |
+#undef err |
|---|
| 22 |
+#undef info |
|---|
| 23 |
+#undef warn |
|---|
| 24 |
|
|---|
| 25 |
#endif /* __SOUND_LOCAL_DRIVER_H */ |
|---|
