Merge branches 'gemini' and 'misc' into devel

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / drivers / usb / host / fhci-dbg.c

diff --git a/drivers/usb/host/fhci-dbg.c b/drivers/usb/host/fhci-dbg.c
index ea8a4255c5da25b29136da57b8849c7bdd3f4285..6fe55004911981bcf8f597781a886f6d677fb43c 100644 (file)
--- a/drivers/usb/host/fhci-dbg.c
+++ b/drivers/usb/host/fhci-dbg.c
@@ -20,7 +20,7 @@
 #include <linux/debugfs.h>
 #include <linux/seq_file.h>
 #include <linux/usb.h>
-#include "../core/hcd.h"
+#include <linux/usb/hcd.h>
 #include "fhci.h"
 
 void fhci_dbg_isr(struct fhci_hcd *fhci, int usb_er)
@@ -108,7 +108,7 @@ void fhci_dfs_create(struct fhci_hcd *fhci)
 {
        struct device *dev = fhci_to_hcd(fhci)->self.controller;
 
-       fhci->dfs_root = debugfs_create_dir(dev_name(dev), NULL);
+       fhci->dfs_root = debugfs_create_dir(dev_name(dev), usb_debug_root);
        if (!fhci->dfs_root) {
                WARN_ON(1);
                return;