On Thu, 2013-11-14 at 13:05 -0500, Alan Stern wrote: > On Thu, 14 Nov 2013 oliver@xxxxxxxxxx wrote: > > > From: Oliver Neukum <oneukum@xxxxxxx> > > > > It has become unnecessary by #define trickery > > > > Signed-off-by: Oliver Neukum <oneukum@xxxxxxx> > > --- > > drivers/usb/host/uhci-hcd.c | 2 -- > > 1 file changed, 2 deletions(-) > > > > diff --git a/drivers/usb/host/uhci-hcd.c b/drivers/usb/host/uhci-hcd.c > > index 8631862..d6e2814 100644 > > --- a/drivers/usb/host/uhci-hcd.c > > +++ b/drivers/usb/host/uhci-hcd.c > > @@ -465,14 +465,12 @@ static irqreturn_t uhci_irq(struct usb_hcd *hcd) > > if (uhci->rh_state >= UHCI_RH_RUNNING) { > > dev_err(uhci_dev(uhci), > > "host controller halted, very bad!\n"); > > -#if defined(DEBUG) || defined(DYNAMIC_DEBUG) > > if (debug > 1 && errbuf) { > > /* Print the schedule for debugging */ > > uhci_sprint_schedule(uhci, errbuf, > > ERRBUF_LEN - EXTRA_SPACE); > > lprintk(errbuf); > > } > > -#endif > > This shouldn't be a separate patch. Merge it into 15/24. OK Regards Oliver -- To unsubscribe from this list: send the line "unsubscribe linux-usb" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html