aboutsummaryrefslogtreecommitdiffstats
path: root/i2c
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@suse.de>2006-06-21 11:34:09 -0700
committerGreg Kroah-Hartman <gregkh@suse.de>2006-06-21 11:34:09 -0700
commit22b41dd0ee0eedc4cc950b64185a8579763ce4ce (patch)
tree2ab52d7c7bd2427bdcaab5220d0226704fc4f295 /i2c
parent47fc8ed39343700b4bedc64121982f217695a5f6 (diff)
downloadpatches-22b41dd0ee0eedc4cc950b64185a8579763ce4ce.tar.gz
refresh to 2.6.17-git2
Diffstat (limited to 'i2c')
-rw-r--r--i2c/hwmon-maintenance-update.patch4
-rw-r--r--i2c/i2c-mark-data-const-for-write-block.patch2
-rw-r--r--i2c/i2c-nforce2-add-mcp51-mcp55-support.patch2
-rw-r--r--i2c/i2c-opencores-cleanup.patch2
4 files changed, 5 insertions, 5 deletions
diff --git a/i2c/hwmon-maintenance-update.patch b/i2c/hwmon-maintenance-update.patch
index eb44784fd5572a..8349abcabd9f76 100644
--- a/i2c/hwmon-maintenance-update.patch
+++ b/i2c/hwmon-maintenance-update.patch
@@ -19,7 +19,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
--- gregkh-2.6.orig/MAINTAINERS
+++ gregkh-2.6/MAINTAINERS
-@@ -2516,12 +2516,6 @@ M: thomas@winischhofer.net
+@@ -2522,12 +2522,6 @@ M: thomas@winischhofer.net
W: http://www.winischhofer.at/linuxsisusbvga.shtml
S: Maintained
@@ -32,7 +32,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
SMB FILESYSTEM
P: Urban Widmark
M: urban@teststation.com
-@@ -3134,12 +3128,6 @@ L: wbsd-devel@list.drzeus.cx
+@@ -3140,12 +3134,6 @@ L: wbsd-devel@list.drzeus.cx
W: http://projects.drzeus.cx/wbsd
S: Maintained
diff --git a/i2c/i2c-mark-data-const-for-write-block.patch b/i2c/i2c-mark-data-const-for-write-block.patch
index 7f5c429d7fc185..224bacb0bcac1a 100644
--- a/i2c/i2c-mark-data-const-for-write-block.patch
+++ b/i2c/i2c-mark-data-const-for-write-block.patch
@@ -43,7 +43,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
--- gregkh-2.6.orig/include/linux/i2c.h
+++ gregkh-2.6/include/linux/i2c.h
-@@ -96,13 +96,13 @@ extern s32 i2c_smbus_write_word_data(str
+@@ -97,13 +97,13 @@ extern s32 i2c_smbus_write_word_data(str
u8 command, u16 value);
extern s32 i2c_smbus_write_block_data(struct i2c_client * client,
u8 command, u8 length,
diff --git a/i2c/i2c-nforce2-add-mcp51-mcp55-support.patch b/i2c/i2c-nforce2-add-mcp51-mcp55-support.patch
index 8865ac32e1095c..75d3f9f22e45bb 100644
--- a/i2c/i2c-nforce2-add-mcp51-mcp55-support.patch
+++ b/i2c/i2c-nforce2-add-mcp51-mcp55-support.patch
@@ -117,7 +117,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
smbuses[1].base = 0; /* to have a check value */
--- gregkh-2.6.orig/include/linux/pci_ids.h
+++ gregkh-2.6/include/linux/pci_ids.h
-@@ -1129,9 +1129,11 @@
+@@ -1130,9 +1130,11 @@
#define PCI_DEVICE_ID_NVIDIA_QUADRO4_900XGL 0x0258
#define PCI_DEVICE_ID_NVIDIA_QUADRO4_750XGL 0x0259
#define PCI_DEVICE_ID_NVIDIA_QUADRO4_700XGL 0x025B
diff --git a/i2c/i2c-opencores-cleanup.patch b/i2c/i2c-opencores-cleanup.patch
index 1ede51b4a2f32e..9e2a374df54f44 100644
--- a/i2c/i2c-opencores-cleanup.patch
+++ b/i2c/i2c-opencores-cleanup.patch
@@ -24,7 +24,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
--- gregkh-2.6.orig/MAINTAINERS
+++ gregkh-2.6/MAINTAINERS
-@@ -2051,6 +2051,12 @@ M: adaplas@pol.net
+@@ -2057,6 +2057,12 @@ M: adaplas@pol.net
L: linux-fbdev-devel@lists.sourceforge.net
S: Maintained