Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6

[pandora-kernel.git] / drivers / usb / host / sl811-hcd.c

diff --git a/drivers/usb/host/sl811-hcd.c b/drivers/usb/host/sl811-hcd.c
index fafccc2..1a99624 100644 (file)
--- a/drivers/usb/host/sl811-hcd.c
+++ b/drivers/usb/host/sl811-hcd.c
@@ -72,12 +72,6 @@ MODULE_ALIAS("platform:sl811-hcd");
 /* for now, use only one transfer register bank */
 #undef USE_B
 
-/* this doesn't understand urb->iso_frame_desc[], but if you had a driver
- * that just queued one ISO frame per URB then iso transfers "should" work
- * using the normal urb status fields.
- */
-#define        DISABLE_ISO
-
 // #define     QUIRK2
 #define        QUIRK3
 
@@ -808,7 +802,7 @@ static int sl811h_urb_enqueue(
        int                     retval;
        struct usb_host_endpoint        *hep = urb->ep;
 
-#ifdef DISABLE_ISO
+#ifndef CONFIG_USB_SL811_HCD_ISO
        if (type == PIPE_ISOCHRONOUS)
                return -ENOSPC;
 #endif