lots of new patches all over the place

4 files changed, 165 insertions, 0 deletions

diff --git a/i2c/fix-w1_master_ds9490_bridge-dependencies.patch b/i2c/fix-w1_master_ds9490_bridge-dependencies.patch
new file mode 100644
index 0000000000000..fb9c10d3f0f73
--- /dev/null
+++ b/i2c/fix-w1_master_ds9490_bridge-dependencies.patch
@@ -0,0 +1,30 @@
+From linux-kernel-owner+greg=40kroah.com-S1752514AbWAFRlI@vger.kernel.org Fri Jan  6 09:53:40 2006
+Date: Fri, 6 Jan 2006 18:41:01 +0100
+From: Adrian Bunk <bunk@stusta.de>
+To: <johnpol@2ka.mipt.ru>, <gregkh@suse.de>
+Subject: [-mm patch] fix W1_MASTER_DS9490_BRIDGE dependencies
+Message-ID: <20060106174101.GT12131@stusta.de>
+Content-Disposition: inline
+
+W1_DS9490 was renamed to W1_MASTER_DS9490, but the entry in the 
+dependencies of W1_MASTER_DS9490_BRIDGE was forgotten.
+
+
+Signed-off-by: Adrian Bunk <bunk@stusta.de>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ drivers/w1/masters/Kconfig |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- gregkh-2.6.orig/drivers/w1/masters/Kconfig
++++ gregkh-2.6/drivers/w1/masters/Kconfig
+@@ -26,7 +26,7 @@ config W1_MASTER_DS9490
+ 
+ config W1_MASTER_DS9490_BRIDGE
+ 	tristate "DS9490R USB <-> W1 transport layer for 1-wire"
+-	depends on W1_DS9490
++	depends on W1_MASTER_DS9490
+ 	help
+ 	  Say Y here if you want to communicate with your 1-wire devices
+ 	  using DS9490R USB bridge.
diff --git a/i2c/i2c-i801-i2c-patch-for-intel-ich8.patch b/i2c/i2c-i801-i2c-patch-for-intel-ich8.patch
new file mode 100644
index 0000000000000..5d3972b6fdf91
--- /dev/null
+++ b/i2c/i2c-i801-i2c-patch-for-intel-ich8.patch
@@ -0,0 +1,48 @@
+From jason.d.gaston@intel.com Mon Jan  9 14:10:45 2006
+From: Jason Gaston <jason.d.gaston@intel.com>
+To: greg@kroah.com
+Subject: i2c-i801: I2C patch for Intel ICH8
+Date: Mon, 9 Jan 2006 10:58:08 -0800
+Content-Disposition: inline
+Message-Id: <200601091058.08652.jason.d.gaston@intel.com>
+
+
+This patch adds the Intel ICH8 DID to the i2c-i801.c and Kconfig files for I2C
+support.
+
+Signed-off-by: Jason Gaston <Jason.d.gaston@intel.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ drivers/i2c/busses/Kconfig    |    1 +
+ drivers/i2c/busses/i2c-i801.c |    2 ++
+ 2 files changed, 3 insertions(+)
+
+--- gregkh-2.6.orig/drivers/i2c/busses/i2c-i801.c
++++ gregkh-2.6/drivers/i2c/busses/i2c-i801.c
+@@ -32,6 +32,7 @@
+     ICH6		266A
+     ICH7		27DA
+     ESB2		269B
++    ICH8		283E
+     This driver supports several versions of Intel's I/O Controller Hubs (ICH).
+     For SMBus support, they are similar to the PIIX4 and are part
+     of Intel's '810' and other chipsets.
+@@ -527,6 +528,7 @@ static struct pci_device_id i801_ids[] =
+ 	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH6_16) },
+ 	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH7_17) },
+ 	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ESB2_17) },
++	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH8_5) },
+ 	{ 0, }
+ };
+ 
+--- gregkh-2.6.orig/drivers/i2c/busses/Kconfig
++++ gregkh-2.6/drivers/i2c/busses/Kconfig
+@@ -124,6 +124,7 @@ config I2C_I801
+ 	    ICH6
+ 	    ICH7
+ 	    ESB2
++	    ICH8
+ 
+ 	  This driver can also be built as a module.  If so, the module
+ 	  will be called i2c-i801.
diff --git a/i2c/i2c-resurrect-i2c_smbus_write_i2c_block_data..patch b/i2c/i2c-resurrect-i2c_smbus_write_i2c_block_data..patch
new file mode 100644
index 0000000000000..c5ae38eda598c
--- /dev/null
+++ b/i2c/i2c-resurrect-i2c_smbus_write_i2c_block_data..patch
@@ -0,0 +1,60 @@
+From benh@kernel.crashing.org Sun Jan  8 20:19:08 2006
+From: Benjamin Herrenschmidt <benh@kernel.crashing.org>
+To: Greg KH <greg@kroah.com>
+Cc: Jean Delvare <khali@linux-fr.org>, Adrian Bunk <bunk@stusta.de>
+Date: Mon, 09 Jan 2006 15:19:18 +1100
+Message-Id: <1136780358.14374.2.camel@localhost.localdomain>
+Subject: I2C: Resurrect i2c_smbus_write_i2c_block_data.
+
+From: Jean Delvare <khali@linux-fr.org>
+
+Signed-off-by: Jean Delvare <khali@linux-fr.org>
+
+---
+ drivers/i2c/i2c-core.c |   15 +++++++++++++++
+ include/linux/i2c.h    |    3 +++
+ 2 files changed, 18 insertions(+)
+
+--- gregkh-2.6.orig/drivers/i2c/i2c-core.c
++++ gregkh-2.6/drivers/i2c/i2c-core.c
+@@ -946,6 +946,20 @@ s32 i2c_smbus_read_i2c_block_data(struct
+ 	}
+ }
+ 
++s32 i2c_smbus_write_i2c_block_data(struct i2c_client *client, u8 command,
++				   u8 length, u8 *values)
++{
++	union i2c_smbus_data data;
++
++	if (length > I2C_SMBUS_BLOCK_MAX)
++		length = I2C_SMBUS_BLOCK_MAX;
++	data.block[0] = length;
++	memcpy(data.block + 1, values, length);
++	return i2c_smbus_xfer(client->adapter, client->addr, client->flags,
++			      I2C_SMBUS_WRITE, command,
++			      I2C_SMBUS_I2C_BLOCK_DATA, &data);
++}
++
+ /* Simulate a SMBus command using the i2c protocol 
+    No checking of parameters is done!  */
+ static s32 i2c_smbus_xfer_emulated(struct i2c_adapter * adapter, u16 addr, 
+@@ -1150,6 +1164,7 @@ EXPORT_SYMBOL(i2c_smbus_read_word_data);
+ EXPORT_SYMBOL(i2c_smbus_write_word_data);
+ EXPORT_SYMBOL(i2c_smbus_write_block_data);
+ EXPORT_SYMBOL(i2c_smbus_read_i2c_block_data);
++EXPORT_SYMBOL(i2c_smbus_write_i2c_block_data);
+ 
+ MODULE_AUTHOR("Simon G. Vogl <simon@tk.uni-linz.ac.at>");
+ MODULE_DESCRIPTION("I2C-Bus main module");
+--- gregkh-2.6.orig/include/linux/i2c.h
++++ gregkh-2.6/include/linux/i2c.h
+@@ -100,6 +100,9 @@ extern s32 i2c_smbus_write_block_data(st
+ /* Returns the number of read bytes */
+ extern s32 i2c_smbus_read_i2c_block_data(struct i2c_client * client,
+ 					 u8 command, u8 *values);
++extern s32 i2c_smbus_write_i2c_block_data(struct i2c_client * client,
++					  u8 command, u8 length,
++					  u8 *values);
+ 
+ /*
+  * A driver is capable of handling one or more physical devices present on
diff --git a/i2c/w1-remove-incorrect-module_alias.patch b/i2c/w1-remove-incorrect-module_alias.patch
new file mode 100644
index 0000000000000..dcc3863ce925a
--- /dev/null
+++ b/i2c/w1-remove-incorrect-module_alias.patch
@@ -0,0 +1,27 @@
+From linux-kernel-owner+greg=40kroah.com-S1161073AbWAGXo5@vger.kernel.org Sat Jan  7 15:48:06 2006
+Message-ID: <43C0524F.1030602@trash.net>
+Date: Sun, 08 Jan 2006 00:44:15 +0100
+From: Patrick McHardy <kaber@trash.net>
+To: Evgeniy Polyakov <johnpol@2ka.mipt.ru>
+Subject: W1: Remove incorrect MODULE_ALIAS
+
+The w1 netlink socket is created by a hardware specific driver calling
+w1_add_master_device, so there is no point in including a module alias
+for netlink autoloading in the core.
+
+Signed-off-by: Patrick McHardy <kaber@trash.net>
+Acked-by: Evgeniy Polyakov <johnpol@2ka.mipt.ru>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ drivers/w1/w1_int.c |    2 --
+ 1 file changed, 2 deletions(-)
+
+--- gregkh-2.6.orig/drivers/w1/w1_int.c
++++ gregkh-2.6/drivers/w1/w1_int.c
+@@ -208,5 +208,3 @@ void w1_remove_master_device(struct w1_b
+ 
+ EXPORT_SYMBOL(w1_add_master_device);
+ EXPORT_SYMBOL(w1_remove_master_device);
+-
+-MODULE_ALIAS_NET_PF_PROTO(PF_NETLINK, NETLINK_W1);