diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2008-10-20 18:13:28 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2008-10-20 18:13:28 -0700 |
| commit | a5fb12075f2cdec9b4d622ad3284643e36450f42 (patch) | |
| tree | 3be092b8ba3caa27b76e36bc5cc0a5d57650c2aa | |
| parent | 964c4ea005fcc3d186ab1b5cd7d71a2ad9b63f98 (diff) | |
| download | patches-a5fb12075f2cdec9b4d622ad3284643e36450f42.tar.gz | |
2.6.27-git9
| -rw-r--r-- | driver-core.current/driver-core-fix-wrong-sysfs-file-attribute-for-memory.patch | 28 | ||||
| -rw-r--r-- | series | 2 | ||||
| -rw-r--r-- | staging/staging-sxg-depends-on-x86.patch | 15 | ||||
| -rw-r--r-- | usb.current/usb-fix-build-warning-in-ehci-hcd-when-config_usb_debug-is-not-enabled.patch | 26 | ||||
| -rw-r--r-- | version | 2 |
5 files changed, 3 insertions, 70 deletions
diff --git a/driver-core.current/driver-core-fix-wrong-sysfs-file-attribute-for-memory.patch b/driver-core.current/driver-core-fix-wrong-sysfs-file-attribute-for-memory.patch deleted file mode 100644 index cd68dc1d0e48f7..00000000000000 --- a/driver-core.current/driver-core-fix-wrong-sysfs-file-attribute-for-memory.patch +++ /dev/null @@ -1,28 +0,0 @@ -From shaohua.li@intel.com Mon Oct 20 16:11:00 2008 -From: Shaohua Li <shaohua.li@intel.com> -Date: Thu, 09 Oct 2008 13:31:22 +0800 -Subject: driver core: fix wrong sysfs file attribute for memory -Cc: Andrew Morton <akpm@linux-foundation.org> -Message-ID: <1223530282.30941.7.camel@sli10-desk.sh.intel.com> - - -This attribute just has write operation. - -Signed-off-by: Shaohua Li <shaohua.li@intel.com> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - drivers/base/memory.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/drivers/base/memory.c -+++ b/drivers/base/memory.c -@@ -325,7 +325,7 @@ memory_probe_store(struct class *class, - - return count; - } --static CLASS_ATTR(probe, 0700, NULL, memory_probe_store); -+static CLASS_ATTR(probe, S_IWUSR, NULL, memory_probe_store); - - static int memory_probe_init(void) - { @@ -14,13 +14,11 @@ gregkh/detect-atomic-counter-underflows.patch driver-core.current/document-kernel-taint-flags-properly.patch driver-core.current/driver-core-drivers-base-sys.c-update-comments.patch driver-core.current/sysfs-fix-return-values-for-sysdev_store_-ulong-int.patch -driver-core.current/driver-core-fix-wrong-sysfs-file-attribute-for-memory.patch ################################# # USB patches for 2.6.28 ################################# usb.current/usb-ohci-add-support-for-tmio-ohci-cell.patch -usb.current/usb-fix-build-warning-in-ehci-hcd-when-config_usb_debug-is-not-enabled.patch usb.current/usb-fix-debugfs_create_file-s-error-checking-method-for-usb-gadget-s3c2410_udc.patch usb.current/usb-storage-avoid-i-o-errors-when-issuing-scsi-ioctls-to-jmicron-usb-ata-bridge.patch usb.current/usb-add-zte-mf626-usb-gsm-modem-entry.patch diff --git a/staging/staging-sxg-depends-on-x86.patch b/staging/staging-sxg-depends-on-x86.patch index 2596c04990fe54..c349d94d6ae5c7 100644 --- a/staging/staging-sxg-depends-on-x86.patch +++ b/staging/staging-sxg-depends-on-x86.patch @@ -15,20 +15,9 @@ Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- - drivers/staging/sxg/Kconfig | 1 + - drivers/staging/sxg/README | 1 + - 2 files changed, 2 insertions(+) + drivers/staging/sxg/README | 1 + + 1 file changed, 1 insertion(+) ---- a/drivers/staging/sxg/Kconfig -+++ b/drivers/staging/sxg/Kconfig -@@ -1,6 +1,7 @@ - config SXG - tristate "Alacritech SLIC Technology Non-Accelerated 10Gbe support" - depends on PCI && NETDEV_10000 -+ depends on X86 - default n - help - This driver supports the Alacritech SLIC Technology Non-Accelerated --- a/drivers/staging/sxg/README +++ b/drivers/staging/sxg/README @@ -7,6 +7,7 @@ TODO: diff --git a/usb.current/usb-fix-build-warning-in-ehci-hcd-when-config_usb_debug-is-not-enabled.patch b/usb.current/usb-fix-build-warning-in-ehci-hcd-when-config_usb_debug-is-not-enabled.patch deleted file mode 100644 index c46002d63fbb12..00000000000000 --- a/usb.current/usb-fix-build-warning-in-ehci-hcd-when-config_usb_debug-is-not-enabled.patch +++ /dev/null @@ -1,26 +0,0 @@ -From foo@baz Tue Apr 9 12:12:43 2002 -Date: Fri, 17 Oct 2008 16:40:17 -0700 -To: Greg KH <greg@kroah.com> -From: Greg Kroah-Hartman <gregkh@suse.de> -Subject: USB: fix build warning in ehci-hcd when CONFIG_USB_DEBUG is not enabled. - -As pointed out by Linus. - -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - drivers/usb/host/ehci-hcd.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/drivers/usb/host/ehci-hcd.c -+++ b/drivers/usb/host/ehci-hcd.c -@@ -1111,8 +1111,8 @@ clean0: - #ifdef DEBUG - debugfs_remove(ehci_debug_root); - ehci_debug_root = NULL; --#endif - err_debug: -+#endif - clear_bit(USB_EHCI_LOADED, &usb_hcds_loaded); - return retval; - } @@ -1 +1 @@ -2.6.27-git8 +2.6.27-git9 |