aboutsummaryrefslogtreecommitdiffstats
diff options
-rw-r--r--foo.patch23
-rw-r--r--gregkh/gkh-version.patch2
-rw-r--r--series6
-rw-r--r--version2
4 files changed, 4 insertions, 29 deletions
diff --git a/foo.patch b/foo.patch
deleted file mode 100644
index 2b3c1d8fd663c9..00000000000000
--- a/foo.patch
+++ /dev/null
@@ -1,23 +0,0 @@
----
- drivers/usb/host/ehci-hub.c | 3 +++
- 1 file changed, 3 insertions(+)
-
---- gregkh-2.6.orig/drivers/usb/host/ehci-hub.c
-+++ gregkh-2.6/drivers/usb/host/ehci-hub.c
-@@ -225,6 +225,8 @@ ehci_hub_status_data (struct usb_hcd *hc
- int ports, i, retval = 1;
- unsigned long flags;
-
-+ printk("GREGKH: %s: hcd->state=0x%x\n", __FUNCTION__, hcd->state);
-+
- /* if !USB_SUSPEND, root hub timers won't get shut down ... */
- if (!HC_IS_RUNNING(hcd->state))
- return 0;
-@@ -254,6 +256,7 @@ ehci_hub_status_data (struct usb_hcd *hc
- }
- if (!(temp & PORT_CONNECT))
- ehci->reset_done [i] = 0;
-+ printk("GREGKH: %s: temp & PORT_RESUME=%d\n", __FUNCTION__, temp&PORT_RESUME);
- if ((temp & (PORT_CSC | PORT_PEC | PORT_OCC)) != 0
- // PORT_STAT_C_SUSPEND?
- || ((temp & PORT_RESUME) != 0
diff --git a/gregkh/gkh-version.patch b/gregkh/gkh-version.patch
index 082e0aa5ad83f6..00c7b59c770e6b 100644
--- a/gregkh/gkh-version.patch
+++ b/gregkh/gkh-version.patch
@@ -9,6 +9,6 @@ Subject: Add my version to the kernel.
1 file changed, 1 insertion(+)
--- /dev/null
-+++ gregkh-2.6/localversion
++++ linux-2.6.18/localversion
@@ -0,0 +1 @@
+-gkh
diff --git a/series b/series
index 8abb7047c0e7a1..3e48bafb13bd85 100644
--- a/series
+++ b/series
@@ -92,7 +92,6 @@ usb/airprime-new-device-id.patch
usb/usb-support-for-bt-on-air-usb-modem-in-cdc-acm.c.patch
usb/usb-remove-private-debug-macros-from-kaweth.patch
usb/usb-suspend-resume-support-for-kaweth.patch
-usb/usb-serial-mos7840-fix-cast.patch
usb/usb-ohci-pnx4008-build-fixes.patch
usb/ueagle-be-suspend-friendly.patch
usb/ueagle-use-interruptible-sleep.patch
@@ -182,7 +181,6 @@ driver-class/sys-subsys-unification.patch
driver/driver-link-sysfs-timing.patch
-ehci-repair-remote-wakeup-support.patch
-usb-hub-autosuspend-autoresume.patch
-foo.patch
+#ehci-repair-remote-wakeup-support.patch
+#usb-hub-autosuspend-autoresume.patch
diff --git a/version b/version
index 011754c0aa2858..0fd14b81cd750e 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-2.6.19-rc1-git5
+2.6.19-rc1-git6