2.6.15-rc6 refresh

1 files changed, 0 insertions, 35 deletions

diff --git a/usb/uhci-add-missing-memory-barriers.patch b/usb/uhci-add-missing-memory-barriers.patch
deleted file mode 100644
index 929791aa81102..0000000000000
--- a/usb/uhci-add-missing-memory-barriers.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From stern@rowland.harvard.edu Wed Nov 30 14:16:10 2005
-Date: Wed, 30 Nov 2005 17:12:10 -0500 (EST)
-From: Alan Stern <stern@rowland.harvard.edu>
-To: Greg KH <greg@kroah.com>
-Subject: UHCI: add missing memory barriers
-Message-ID: <Pine.LNX.4.44L0.0511301711050.5778-100000@iolanthe.rowland.org>
-
-This patch (as617) adds a couple of memory barriers that Ben H. forgot in
-his recent suspend/resume fix.
-
-Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
-Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-
----
- drivers/usb/host/uhci-hcd.c |    2 ++
- 1 file changed, 2 insertions(+)
-
---- gregkh-2.6.orig/drivers/usb/host/uhci-hcd.c
-+++ gregkh-2.6/drivers/usb/host/uhci-hcd.c
-@@ -717,6 +717,7 @@ static int uhci_suspend(struct usb_hcd *
- 	 * at the source, so we must turn off PIRQ.
- 	 */
- 	pci_write_config_word(to_pci_dev(uhci_dev(uhci)), USBLEGSUP, 0);
-+	mb();
- 	clear_bit(HCD_FLAG_HW_ACCESSIBLE, &hcd->flags);
- 	uhci->hc_inaccessible = 1;
- 	hcd->poll_rh = 0;
-@@ -738,6 +739,7 @@ static int uhci_resume(struct usb_hcd *h
- 	 * really don't want to keep a stale HCD_FLAG_HW_ACCESSIBLE=0
- 	 */
- 	set_bit(HCD_FLAG_HW_ACCESSIBLE, &hcd->flags);
-+	mb();
- 
- 	if (uhci->rh_state == UHCI_RH_RESET)	/* Dead */
- 		return 0;