aboutsummaryrefslogtreecommitdiffstats
diff options
-rw-r--r--series1
-rw-r--r--usb/usb-omap-update-mach-usb.h-to-allow-ehci-driver-to-build.patch55
2 files changed, 0 insertions, 56 deletions
diff --git a/series b/series
index f3d948eea1922f..63a9ec466f3d7c 100644
--- a/series
+++ b/series
@@ -138,7 +138,6 @@ usb/usb-interface-association-descriptors-added-to-cdc-rndis.patch
usb/usb-serial-sierra-driver-memory-reduction.patch
usb/usb-ehci-add-native-scatter-gather-support.patch
usb/usb-add-scatter-gather-support-to-usbmon.patch
-usb/usb-omap-update-mach-usb.h-to-allow-ehci-driver-to-build.patch
usb/usb-ehci-allow-ehci-to-be-built-on-omap3.patch
usb/usb-check-results-of-dma_map_single.patch
usb/usb-exposing-second-acm-channel-as-tty-for-nokia-s60-phones.patch
diff --git a/usb/usb-omap-update-mach-usb.h-to-allow-ehci-driver-to-build.patch b/usb/usb-omap-update-mach-usb.h-to-allow-ehci-driver-to-build.patch
deleted file mode 100644
index a1250acf60865e..00000000000000
--- a/usb/usb-omap-update-mach-usb.h-to-allow-ehci-driver-to-build.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From gadiyar@ti.com Fri Nov 6 14:55:49 2009
-From: Anand Gadiyar <gadiyar@ti.com>
-Date: Sat, 7 Nov 2009 01:15:59 +0530
-Subject: USB: OMAP: update mach/usb.h to allow ehci driver to build
-Cc: Anand Gadiyar <gadiyar@ti.com>, Felipe Balbi <felipe.balbi@nokia.com>, Tony Lindgren <tony@atomide.com>
-Message-ID: <1257536759-15242-1-git-send-email-gadiyar@ti.com>
-
-
-OMAP: update mach/usb.h to allow ehci driver to build
-
-Add missing declarations to allow the recently introduced
-ehci-omap driver to build on OMAP3
-
-Signed-off-by: Anand Gadiyar <gadiyar@ti.com>
-Cc: Felipe Balbi <felipe.balbi@nokia.com>
-Cc: Tony Lindgren <tony@atomide.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-
----
- arch/arm/plat-omap/include/mach/usb.h | 17 +++++++++++++++++
- 1 file changed, 17 insertions(+)
-
---- a/arch/arm/plat-omap/include/mach/usb.h
-+++ b/arch/arm/plat-omap/include/mach/usb.h
-@@ -5,6 +5,21 @@
-
- #include <mach/board.h>
-
-+#define OMAP3_HS_USB_PORTS 3
-+enum ehci_hcd_omap_mode {
-+ EHCI_HCD_OMAP_MODE_UNKNOWN,
-+ EHCI_HCD_OMAP_MODE_PHY,
-+ EHCI_HCD_OMAP_MODE_TLL,
-+};
-+
-+struct ehci_hcd_omap_platform_data {
-+ enum ehci_hcd_omap_mode port_mode[OMAP3_HS_USB_PORTS];
-+ unsigned phy_reset:1;
-+
-+ /* have to be valid if phy_reset is true and portx is in phy mode */
-+ int reset_gpio_port[OMAP3_HS_USB_PORTS];
-+};
-+
- /*-------------------------------------------------------------------------*/
-
- #define OMAP1_OTG_BASE 0xfffb0400
-@@ -29,6 +44,8 @@
-
- extern void usb_musb_init(void);
-
-+extern void usb_ehci_init(struct ehci_hcd_omap_platform_data *pdata);
-+
- #endif
-
- void omap_usb_init(struct omap_usb_config *pdata);