Merge tag 'v3.10.71' into update

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / include / linux / usb / hcd.h

diff --git a/include/linux/usb/hcd.h b/include/linux/usb/hcd.h
index f5f5c7dfda90ebe2656176c058672b75854c3176..bf4778385baad72977bb7667e01d2d675e2b7456 100644 (file)
--- a/include/linux/usb/hcd.h
+++ b/include/linux/usb/hcd.h
@@ -23,7 +23,11 @@
 
 #include <linux/rwsem.h>
 
+#ifdef CONFIG_USBIF_COMPLIANCE
+#define MAX_TOPO_LEVEL         2
+#else
 #define MAX_TOPO_LEVEL         6
+#endif
 
 /* This file contains declarations of usbcore internals that are mostly
  * used or exposed by Host Controller Drivers.
@@ -410,12 +414,13 @@ extern int usb_hcd_pci_probe(struct pci_dev *dev,
 extern void usb_hcd_pci_remove(struct pci_dev *dev);
 extern void usb_hcd_pci_shutdown(struct pci_dev *dev);
 
-#ifdef CONFIG_PM_SLEEP
+#ifdef CONFIG_PM
 extern const struct dev_pm_ops usb_hcd_pci_pm_ops;
 #endif
 #endif /* CONFIG_PCI */
 
 /* pci-ish (pdev null is ok) buffer alloc/mapping support */
+void usb_init_pool_max(void);
 int hcd_buffer_create(struct usb_hcd *hcd);
 void hcd_buffer_destroy(struct usb_hcd *hcd);