more patches added

1 files changed, 79 insertions, 0 deletions

diff --git a/i2c/w1-warning-fix.patch b/i2c/w1-warning-fix.patch
new file mode 100644
index 0000000000000..df64a6f6802fc
--- /dev/null
+++ b/i2c/w1-warning-fix.patch
@@ -0,0 +1,79 @@
+From akpm@osdl.org Sun May 14 21:47:12 2006
+Message-Id: <200605150446.k4F4kwh1023981@shell0.pdx.osdl.net>
+From: Andrew Morton <akpm@osdl.org>
+Subject: w1: warning fix
+From: akpm@osdl.org
+Date: Sun, 14 May 2006 21:43:50 -0700
+
+From: Andrew Morton <akpm@osdl.org>
+
+drivers/w1/w1.c:423: warning: long long unsigned int format, __u64 arg (arg 8)
+
+u64 is not, never has been and never will be "unsigned long long"!
+
+While we're there, fix up some code layout - it looks awful in an 80-col
+display.
+
+Cc: Evgeniy Polyakov <johnpol@2ka.mipt.ru>
+Signed-off-by: Andrew Morton <akpm@osdl.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ drivers/w1/w1.c |   19 +++++++++++++------
+ 1 file changed, 13 insertions(+), 6 deletions(-)
+
+--- gregkh-2.6.orig/drivers/w1/w1.c
++++ gregkh-2.6/drivers/w1/w1.c
+@@ -391,7 +391,8 @@ static void w1_destroy_master_attributes
+ }
+ 
+ #ifdef CONFIG_HOTPLUG
+-static int w1_uevent(struct device *dev, char **envp, int num_envp, char *buffer, int buffer_size)
++static int w1_uevent(struct device *dev, char **envp, int num_envp,
++			char *buffer, int buffer_size)
+ {
+ 	struct w1_master *md = NULL;
+ 	struct w1_slave *sl = NULL;
+@@ -411,23 +412,28 @@ static int w1_uevent(struct device *dev,
+ 		return -EINVAL;
+ 	}
+ 
+-	dev_dbg(dev, "Hotplug event for %s %s, bus_id=%s.\n", event_owner, name, dev->bus_id);
++	dev_dbg(dev, "Hotplug event for %s %s, bus_id=%s.\n",
++			event_owner, name, dev->bus_id);
+ 
+ 	if (dev->driver != &w1_slave_driver || !sl)
+ 		return 0;
+ 
+-	err = add_uevent_var(envp, num_envp, &cur_index, buffer, buffer_size, &cur_len, "W1_FID=%02X", sl->reg_num.family);
++	err = add_uevent_var(envp, num_envp, &cur_index, buffer, buffer_size,
++			&cur_len, "W1_FID=%02X", sl->reg_num.family);
+ 	if (err)
+ 		return err;
+ 
+-	err = add_uevent_var(envp, num_envp, &cur_index, buffer, buffer_size, &cur_len, "W1_SLAVE_ID=%024LX", (u64)sl->reg_num.id);
++	err = add_uevent_var(envp, num_envp, &cur_index, buffer, buffer_size,
++			&cur_len, "W1_SLAVE_ID=%024LX",
++			(unsigned long long)sl->reg_num.id);
+ 	if (err)
+ 		return err;
+ 
+ 	return 0;
+ };
+ #else
+-static int w1_uevent(struct device *dev, char **envp, int num_envp, char *buffer, int buffer_size)
++static int w1_uevent(struct device *dev, char **envp, int num_envp,
++			char *buffer, int buffer_size)
+ {
+ 	return 0;
+ }
+@@ -451,7 +457,8 @@ static int __w1_attach_slave_device(stru
+ 		 (unsigned int) sl->reg_num.family,
+ 		 (unsigned long long) sl->reg_num.id);
+ 
+-	dev_dbg(&sl->dev, "%s: registering %s as %p.\n", __func__, &sl->dev.bus_id[0]);
++	dev_dbg(&sl->dev, "%s: registering %s as %p.\n", __func__,
++		&sl->dev.bus_id[0]);
+ 
+ 	err = device_register(&sl->dev);
+ 	if (err < 0) {