diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2007-02-16 14:27:38 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2007-02-16 14:27:38 -0800 |
| commit | f7e311fd26b34f6890f46cff35e55a893bc34de7 (patch) | |
| tree | c81af082a871717a25b92ef9406bb53bb7898e2a | |
| parent | 340fea09d6d4d4bb5e59dd04d9e1c039377984d1 (diff) | |
| download | patches-f7e311fd26b34f6890f46cff35e55a893bc34de7.tar.gz | |
version resync
| -rw-r--r-- | driver/sysfs-crash-debugging.patch | 2 | ||||
| -rw-r--r-- | driver/warn-when-statically-allocated-kobjects-are-used.patch | 2 | ||||
| -rw-r--r-- | pci/pci-make-cardbus_mem_size-and-cardbus_io_size-boot-options.patch | 2 | ||||
| -rw-r--r-- | series | 1 | ||||
| -rw-r--r-- | usb/usb-fix-fallout-from-usbcore-bandwidth-removal.patch | 37 | ||||
| -rw-r--r-- | version | 2 |
6 files changed, 4 insertions, 42 deletions
diff --git a/driver/sysfs-crash-debugging.patch b/driver/sysfs-crash-debugging.patch index 00cacfdc4afe1a..b0862267440daa 100644 --- a/driver/sysfs-crash-debugging.patch +++ b/driver/sysfs-crash-debugging.patch @@ -25,7 +25,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- gregkh-2.6.orig/arch/i386/kernel/traps.c +++ gregkh-2.6/arch/i386/kernel/traps.c -@@ -422,6 +422,7 @@ void die(const char * str, struct pt_reg +@@ -425,6 +425,7 @@ void die(const char * str, struct pt_reg #endif if (nl) printk("\n"); diff --git a/driver/warn-when-statically-allocated-kobjects-are-used.patch b/driver/warn-when-statically-allocated-kobjects-are-used.patch index 8e80474e5c4fa4..bfe17a7fbcb75d 100644 --- a/driver/warn-when-statically-allocated-kobjects-are-used.patch +++ b/driver/warn-when-statically-allocated-kobjects-are-used.patch @@ -36,7 +36,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- gregkh-2.6.orig/arch/i386/kernel/vmlinux.lds.S +++ gregkh-2.6/arch/i386/kernel/vmlinux.lds.S -@@ -56,6 +56,8 @@ SECTIONS +@@ -61,6 +61,8 @@ SECTIONS __stop___ex_table = .; } diff --git a/pci/pci-make-cardbus_mem_size-and-cardbus_io_size-boot-options.patch b/pci/pci-make-cardbus_mem_size-and-cardbus_io_size-boot-options.patch index d98594c54eac42..b3e5b7bb6ef963 100644 --- a/pci/pci-make-cardbus_mem_size-and-cardbus_io_size-boot-options.patch +++ b/pci/pci-make-cardbus_mem_size-and-cardbus_io_size-boot-options.patch @@ -31,7 +31,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- gregkh-2.6.orig/Documentation/kernel-parameters.txt +++ gregkh-2.6/Documentation/kernel-parameters.txt -@@ -1259,6 +1259,12 @@ and is between 256 and 4096 characters. +@@ -1267,6 +1267,12 @@ and is between 256 and 4096 characters. This sorting is done to get a device order compatible with older (<= 2.4) kernels. nobfsort Don't sort PCI devices into breadth-first order. @@ -55,7 +55,6 @@ usb/usb-in-init_endpoint_class-use-ptr_err-to-obtain-an-errno-value-not-is_err.p usb/usb-fix-needless-failure-under-certain-conditions.patch usb/usb-pl2303-willcom-ws002in-support.patch usb/usb-teac-hd-35pu-patch-to-unusual_devs.h.patch -usb/usb-fix-fallout-from-usbcore-bandwidth-removal.patch usb/usb-unusual_devs-update-for-sony-p990i-phone.patch usb/usb-add-flow-control-to-usb-serial-generic-driver.patch usb/usb-fix-apparent-typo-config_usb_cdcether.patch diff --git a/usb/usb-fix-fallout-from-usbcore-bandwidth-removal.patch b/usb/usb-fix-fallout-from-usbcore-bandwidth-removal.patch deleted file mode 100644 index 8f737bc34f7e72..00000000000000 --- a/usb/usb-fix-fallout-from-usbcore-bandwidth-removal.patch +++ /dev/null @@ -1,37 +0,0 @@ -From stern@rowland.harvard.edu Tue Jan 30 07:34:18 2007 -From: Alan Stern <stern@rowland.harvard.edu> -Date: Tue, 30 Jan 2007 10:34:15 -0500 (EST) -Subject: USB: Fix fallout from usbcore bandwidth removal -To: Greg KH <greg@kroah.com> -Message-ID: <Pine.LNX.4.44L0.0701301031090.3473-100000@iolanthe.rowland.org> - - -This patch (as845) cleans up some fallout from the removal of the -usbcore bandwidth machinery. - -Signed-off-by: Alan Stern <stern@rowland.harvard.edu> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - sound/usb/usbaudio.c | 10 ---------- - 1 file changed, 10 deletions(-) - ---- gregkh-2.6.orig/sound/usb/usbaudio.c -+++ gregkh-2.6/sound/usb/usbaudio.c -@@ -325,16 +325,6 @@ static int prepare_capture_urb(struct sn - } - urb->transfer_buffer_length = offs; - urb->number_of_packets = ctx->packets; --#if 0 // for check -- if (! urb->bandwidth) { -- int bustime; -- bustime = usb_check_bandwidth(urb->dev, urb); -- if (bustime < 0) -- return bustime; -- printk("urb %d: bandwidth = %d (packets = %d)\n", ctx->index, bustime, urb->number_of_packets); -- usb_claim_bandwidth(urb->dev, urb, bustime, 1); -- } --#endif // for check - return 0; - } - @@ -1 +1 @@ -2.6.20-git11 +2.6.20-git13 |