--- a/compat/compat-2.6.28.c
+++ b/compat/compat-2.6.28.c
@@ -165,7 +165,7 @@ EXPORT_SYMBOL_GPL(pcmcia_loop_config);
 
 #endif /* CONFIG_PCMCIA */
 
-#if defined(CONFIG_USB) || defined(CONFIG_USB_MODULE)
+#if 0
 
 void usb_unpoison_urb(struct urb *urb)
 {
--- a/compat/compat-2.6.29.c
+++ b/compat/compat-2.6.29.c
@@ -49,7 +49,7 @@ void netdev_attach_ops(struct net_device
 EXPORT_SYMBOL_GPL(netdev_attach_ops);
 
 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,23))
-#if defined(CONFIG_USB) || defined(CONFIG_USB_MODULE)
+#if 0
 /**
  * usb_unpoison_anchored_urbs - let an anchor be used successfully again
  * @anchor: anchor the requests are bound to
--- a/include/linux/compat-2.6.28.h
+++ b/include/linux/compat-2.6.28.h
@@ -74,7 +74,7 @@ int pcmcia_loop_config(struct pcmcia_dev
 /* USB anchors were added as of 2.6.23 */
 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,23))
 
-#if defined(CONFIG_USB) || defined(CONFIG_USB_MODULE)
+#if 0
 #if 0
 extern void usb_poison_urb(struct urb *urb);
 #endif
--- a/config.mk
+++ b/config.mk
@@ -510,7 +510,7 @@ endif #CONFIG_COMPAT_KERNEL_2_6_29
 # This activates a threading fix for usb urb.
 # this is mainline commit: b3e670443b7fb8a2d29831b62b44a039c283e351
 # This fix will be included in some stable releases.
-export CONFIG_COMPAT_USB_URB_THREAD_FIX=y
+# export CONFIG_COMPAT_USB_URB_THREAD_FIX=y
 
 export CONFIG_ATH9K_HTC=m
 # export CONFIG_ATH9K_HTC_DEBUGFS=y
