refresh for 2.6.16-rc6

3 files changed, 61 insertions, 61 deletions

diff --git a/i2c/hwmon-w83627hf-add-w83687thf-support.patch b/i2c/hwmon-w83627hf-add-w83687thf-support.patch
index 539dd12ee2c16..b376e2b9b5f2a 100644
--- a/i2c/hwmon-w83627hf-add-w83687thf-support.patch
+++ b/i2c/hwmon-w83627hf-add-w83687thf-support.patch
@@ -20,6 +20,39 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  drivers/hwmon/w83627hf.c     |   72 ++++++++++++++++++++++++++++++++++---------
  3 files changed, 66 insertions(+), 17 deletions(-)
 
+--- gregkh-2.6.orig/Documentation/hwmon/w83627hf
++++ gregkh-2.6/Documentation/hwmon/w83627hf
+@@ -18,6 +18,10 @@ Supported chips:
+     Prefix: 'w83637hf'
+     Addresses scanned: ISA address retrieved from Super I/O registers
+     Datasheet: http://www.winbond.com/PDF/sheet/w83637hf.pdf
++  * Winbond W83687THF
++    Prefix: 'w83687thf'
++    Addresses scanned: ISA address retrieved from Super I/O registers
++    Datasheet: Provided by Winbond on request
+ 
+ Authors:
+         Frodo Looijaard <frodol@dds.nl>,
+--- gregkh-2.6.orig/drivers/hwmon/Kconfig
++++ gregkh-2.6/drivers/hwmon/Kconfig
+@@ -406,13 +406,14 @@ config SENSORS_W83L785TS
+ 	  will be called w83l785ts.
+ 
+ config SENSORS_W83627HF
+-	tristate "Winbond W83627HF, W83627THF, W83637HF, W83697HF"
+-	depends on HWMON && I2C && EXPERIMENTAL
++	tristate "Winbond W83627HF, W83627THF, W83637HF, W83687THF, W83697HF"
++	depends on HWMON && I2C
+ 	select I2C_ISA
+ 	select HWMON_VID
+ 	help
+ 	  If you say yes here you get support for the Winbond W836X7 series
+-	  of sensor chips: the W83627HF, W83627THF, W83637HF, and the W83697HF
++	  of sensor chips: the W83627HF, W83627THF, W83637HF, W83687THF and
++	  W83697HF.
+ 
+ 	  This driver can also be built as a module.  If so, the module
+ 	  will be called w83627hf.
 --- gregkh-2.6.orig/drivers/hwmon/w83627hf.c
 +++ gregkh-2.6/drivers/hwmon/w83627hf.c
 @@ -28,6 +28,7 @@
@@ -217,36 +250,3 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  			    && (i == 5 || i == 6)))
  				continue;
  			data->in[i] =
---- gregkh-2.6.orig/Documentation/hwmon/w83627hf
-+++ gregkh-2.6/Documentation/hwmon/w83627hf
-@@ -18,6 +18,10 @@ Supported chips:
-     Prefix: 'w83637hf'
-     Addresses scanned: ISA address retrieved from Super I/O registers
-     Datasheet: http://www.winbond.com/PDF/sheet/w83637hf.pdf
-+  * Winbond W83687THF
-+    Prefix: 'w83687thf'
-+    Addresses scanned: ISA address retrieved from Super I/O registers
-+    Datasheet: Provided by Winbond on request
- 
- Authors:
-         Frodo Looijaard <frodol@dds.nl>,
---- gregkh-2.6.orig/drivers/hwmon/Kconfig
-+++ gregkh-2.6/drivers/hwmon/Kconfig
-@@ -406,13 +406,14 @@ config SENSORS_W83L785TS
- 	  will be called w83l785ts.
- 
- config SENSORS_W83627HF
--	tristate "Winbond W83627HF, W83627THF, W83637HF, W83697HF"
--	depends on HWMON && I2C && EXPERIMENTAL
-+	tristate "Winbond W83627HF, W83627THF, W83637HF, W83687THF, W83697HF"
-+	depends on HWMON && I2C
- 	select I2C_ISA
- 	select HWMON_VID
- 	help
- 	  If you say yes here you get support for the Winbond W836X7 series
--	  of sensor chips: the W83627HF, W83627THF, W83637HF, and the W83697HF
-+	  of sensor chips: the W83627HF, W83627THF, W83637HF, W83687THF and
-+	  W83697HF.
- 
- 	  This driver can also be built as a module.  If so, the module
- 	  will be called w83627hf.
diff --git a/i2c/hwmon-w83781d-no-reset-by-default.patch b/i2c/hwmon-w83781d-no-reset-by-default.patch
index 352bcef763723..a4db3f4613204 100644
--- a/i2c/hwmon-w83781d-no-reset-by-default.patch
+++ b/i2c/hwmon-w83781d-no-reset-by-default.patch
@@ -17,6 +17,20 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  drivers/hwmon/w83781d.c     |   22 +++++++++++++++++++++-
  2 files changed, 26 insertions(+), 1 deletion(-)
 
+--- gregkh-2.6.orig/Documentation/hwmon/w83781d
++++ gregkh-2.6/Documentation/hwmon/w83781d
+@@ -36,6 +36,11 @@ Module parameters
+   Use 'init=0' to bypass initializing the chip.
+   Try this if your computer crashes when you load the module.
+ 
++* reset int
++  (default 0)
++  The driver used to reset the chip on load, but does no more. Use
++  'reset=1' to restore the old behavior. Report if you need to do this.
++
+ force_subclients=bus,caddr,saddr,saddr
+   This is used to force the i2c addresses for subclients of
+   a certain chip. Typical usage is `force_subclients=0,0x2d,0x4a,0x4b'
 --- gregkh-2.6.orig/drivers/hwmon/w83781d.c
 +++ gregkh-2.6/drivers/hwmon/w83781d.c
 @@ -57,6 +57,10 @@ I2C_CLIENT_INSMOD_5(w83781d, w83782d, w8
@@ -63,17 +77,3 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  	data->vrm = vid_which_vrm();
  
  	if ((type != w83781d) && (type != as99127f)) {
---- gregkh-2.6.orig/Documentation/hwmon/w83781d
-+++ gregkh-2.6/Documentation/hwmon/w83781d
-@@ -36,6 +36,11 @@ Module parameters
-   Use 'init=0' to bypass initializing the chip.
-   Try this if your computer crashes when you load the module.
- 
-+* reset int
-+  (default 0)
-+  The driver used to reset the chip on load, but does no more. Use
-+  'reset=1' to restore the old behavior. Report if you need to do this.
-+
- force_subclients=bus,caddr,saddr,saddr
-   This is used to force the i2c addresses for subclients of
-   a certain chip. Typical usage is `force_subclients=0,0x2d,0x4a,0x4b'
diff --git a/i2c/w1-misc-cleanups.patch b/i2c/w1-misc-cleanups.patch
index bcd5e03c88ef5..01abfea4c7888 100644
--- a/i2c/w1-misc-cleanups.patch
+++ b/i2c/w1-misc-cleanups.patch
@@ -56,20 +56,6 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  {
  	sysfs_remove_group(&master->dev.kobj, &w1_master_defattr_group);
  }
---- gregkh-2.6.orig/drivers/w1/w1_family.c
-+++ gregkh-2.6/drivers/w1/w1_family.c
-@@ -25,10 +25,10 @@
- #include <linux/delay.h>
- 
- #include "w1_family.h"
-+#include "w1.h"
- 
- DEFINE_SPINLOCK(w1_flock);
- static LIST_HEAD(w1_families);
--extern void w1_reconnect_slaves(struct w1_family *f);
- 
- int w1_register_family(struct w1_family *newf)
- {
 --- gregkh-2.6.orig/drivers/w1/w1.h
 +++ gregkh-2.6/drivers/w1/w1.h
 @@ -203,6 +203,16 @@ static inline struct w1_master* dev_to_w
@@ -89,6 +75,20 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  #endif /* __KERNEL__ */
  
  #endif /* __W1_H */
+--- gregkh-2.6.orig/drivers/w1/w1_family.c
++++ gregkh-2.6/drivers/w1/w1_family.c
+@@ -25,10 +25,10 @@
+ #include <linux/delay.h>
+ 
+ #include "w1_family.h"
++#include "w1.h"
+ 
+ DEFINE_SPINLOCK(w1_flock);
+ static LIST_HEAD(w1_families);
+-extern void w1_reconnect_slaves(struct w1_family *f);
+ 
+ int w1_register_family(struct w1_family *newf)
+ {
 --- gregkh-2.6.orig/drivers/w1/w1_int.c
 +++ gregkh-2.6/drivers/w1/w1_int.c
 @@ -26,19 +26,10 @@