Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6

Conflicts:

	drivers/pci/dmar.c

1 files changed, 1 insertions, 1 deletions

diff --git a/drivers/usb/host/ehci-hcd.c b/drivers/usb/host/ehci-hcd.c
index d343afacb0b0..15a803b206b8 100644
--- a/drivers/usb/host/ehci-hcd.c
+++ b/drivers/usb/host/ehci-hcd.c
@@ -1111,8 +1111,8 @@ clean0:
 #ifdef DEBUG
         debugfs_remove(ehci_debug_root);
         ehci_debug_root = NULL;
-#endif
 err_debug:
+#endif
         clear_bit(USB_EHCI_LOADED, &usb_hcds_loaded);
         return retval;
 }