refresh and a new documentation patch

4 files changed, 46 insertions, 3 deletions

diff --git a/driver/aoe-01.patch b/driver/aoe-01.patch
index f8c9006a9c90c..72d7f1dd11d4d 100644
--- a/driver/aoe-01.patch
+++ b/driver/aoe-01.patch
@@ -1,7 +1,7 @@
 From ecashin@coraid.com Thu Sep 29 10:06:27 2005
 From: "Ed L. Cashin" <ecashin@coraid.com>
 CC: ecashin@coraid.com, Greg K-H <greg@kroah.com>, "David S. Miller" <davem@davemloft.net>
-Subject: [PATCH 2.6.14-rc2] aoe [2/3]: use get_unaligned for accesses in ATA id buffer
+Subject: aoe: use get_unaligned for accesses in ATA id buffer
 Date: Thu, 29 Sep 2005 12:47:40 -0400
 Message-ID: <87mzlvakib.fsf@coraid.com>
 
diff --git a/driver/aoe-02.patch b/driver/aoe-02.patch
index 6d904d967514c..9e3a450c58bcd 100644
--- a/driver/aoe-02.patch
+++ b/driver/aoe-02.patch
@@ -1,7 +1,7 @@
 From ecashin@coraid.com Thu Sep 29 10:06:31 2005
 From: "Ed L. Cashin" <ecashin@coraid.com>
 CC: ecashin@coraid.com, Greg K-H <greg@kroah.com>
-Subject: [PATCH 2.6.14-rc2] aoe [3/3]: update to version 14
+Subject: aoe: update to version 14
 Date: Thu, 29 Sep 2005 12:47:55 -0400
 Message-ID: <87ek77akhw.fsf@coraid.com>
 
diff --git a/driver/driver-ide-tape-sysfs.patch b/driver/driver-ide-tape-sysfs.patch
index 4afaf0a2bfa84..6fffd8aadaf2e 100644
--- a/driver/driver-ide-tape-sysfs.patch
+++ b/driver/driver-ide-tape-sysfs.patch
@@ -1,6 +1,6 @@
 From akpm@osdl.org Fri Sep 16 03:00:38 2005
 Message-Id: <200509160955.j8G9tcOZ019958@shell0.pdx.osdl.net>
-Subject: + sysfs-device-support-for-ide-tape.patch added to -mm tree
+Subject: add sysfs support for ide tape
 To: will.dyson@gmail.com, gadio@netvision.net.il, greg@kroah.com,
 From: akpm@osdl.org
 Date: Fri, 16 Sep 2005 02:55:07 -0700
diff --git a/driver/fix-documentation-of-driver-suspend-resume-callbacks.patch b/driver/fix-documentation-of-driver-suspend-resume-callbacks.patch
new file mode 100644
index 0000000000000..3cf09d4a54838
--- /dev/null
+++ b/driver/fix-documentation-of-driver-suspend-resume-callbacks.patch
@@ -0,0 +1,43 @@
+From tiwai@suse.de Fri Oct 28 07:50:37 2005
+Date: Fri, 28 Oct 2005 16:45:34 +0200
+Message-ID: <s5hoe59bsz5.wl%tiwai@suse.de>
+From: Takashi Iwai <tiwai@suse.de>
+To: Russell King <rmk+lkml@arm.linux.org.uk>
+Cc: Greg K-H <greg@kroah.com>
+Subject: Fix documentation of driver suspend/resume callbacks
+
+Signed-off-by: Takashi Iwai <tiwai@suse.de>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+
+---
+ Documentation/driver-model/driver.txt |    8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+--- gregkh-2.6.orig/Documentation/driver-model/driver.txt
++++ gregkh-2.6/Documentation/driver-model/driver.txt
+@@ -14,8 +14,8 @@ struct device_driver {
+         int     (*probe)        (struct device * dev);
+         int     (*remove)       (struct device * dev);
+ 
+-        int     (*suspend)      (struct device * dev, pm_message_t state, u32 level);
+-        int     (*resume)       (struct device * dev, u32 level);
++        int     (*suspend)      (struct device * dev, pm_message_t state);
++        int     (*resume)       (struct device * dev);
+ };
+ 
+ 
+@@ -194,11 +194,11 @@ device; i.e. anything in the device's dr
+ If the device is still present, it should quiesce the device and place
+ it into a supported low-power state.
+ 
+-	int	(*suspend)	(struct device * dev, pm_message_t state, u32 level);
++	int	(*suspend)	(struct device * dev, pm_message_t state);
+ 
+ suspend is called to put the device in a low power state.
+ 
+-	int	(*resume)	(struct device * dev, u32 level);
++	int	(*resume)	(struct device * dev);
+ 
+ Resume is used to bring a device back from a low power state.
+