diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2006-01-05 09:21:34 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-01-05 09:21:34 -0800 |
| commit | 3c5bdf48c8d492dfdcbb3ac3a7c1242bd1a6e6e1 (patch) | |
| tree | e442b9a742271bce0cf60901006a2a0cee63e0f9 /i2c | |
| parent | 7c5bb7c46c50b7a008ed3401c1d018dcd192d288 (diff) | |
| download | patches-3c5bdf48c8d492dfdcbb3ac3a7c1242bd1a6e6e1.tar.gz | |
refresh for 2.6.15-git1
Diffstat (limited to 'i2c')
3 files changed, 6 insertions, 7 deletions
diff --git a/i2c/hwmon-vt8231-new-driver.patch b/i2c/hwmon-vt8231-new-driver.patch index a71b3bff76780..51a7778fb4ae1 100644 --- a/i2c/hwmon-vt8231-new-driver.patch +++ b/i2c/hwmon-vt8231-new-driver.patch @@ -919,7 +919,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> +module_exit(sm_vt8231_exit); --- gregkh-2.6.orig/MAINTAINERS +++ gregkh-2.6/MAINTAINERS -@@ -2893,6 +2893,12 @@ W: http://linuxtv.org +@@ -2902,6 +2902,12 @@ W: http://linuxtv.org T: git kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb.git S: Maintained diff --git a/i2c/i2c-nforce2-support-nforce4-mcp04.patch b/i2c/i2c-nforce2-support-nforce4-mcp04.patch index e65123ef4c7a9..37b2df783581c 100644 --- a/i2c/i2c-nforce2-support-nforce4-mcp04.patch +++ b/i2c/i2c-nforce2-support-nforce4-mcp04.patch @@ -49,7 +49,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> AMD-8111 SMBus 2.0 adapter. --- gregkh-2.6.orig/include/linux/pci_ids.h +++ gregkh-2.6/include/linux/pci_ids.h -@@ -971,6 +971,7 @@ +@@ -976,6 +976,7 @@ #define PCI_DEVICE_ID_NVIDIA_TNT_UNKNOWN 0x002a #define PCI_DEVICE_ID_NVIDIA_VTNT2 0x002C #define PCI_DEVICE_ID_NVIDIA_UVTNT2 0x002D diff --git a/i2c/w1-move-w1-bus-master-code-into-w1-masters-and-move-w1-slave-code-into-w1-slaves.patch b/i2c/w1-move-w1-bus-master-code-into-w1-masters-and-move-w1-slave-code-into-w1-slaves.patch index 3b93c3962637e..42492d3d4508b 100644 --- a/i2c/w1-move-w1-bus-master-code-into-w1-masters-and-move-w1-slave-code-into-w1-slaves.patch +++ b/i2c/w1-move-w1-bus-master-code-into-w1-masters-and-move-w1-slave-code-into-w1-slaves.patch @@ -14,12 +14,12 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> drivers/w1/Kconfig | 60 -- drivers/w1/Makefile | 10 drivers/w1/ds_w1_bridge.c | 174 -------- - drivers/w1/dscore.c | 796 -------------------------------------- + drivers/w1/dscore.c | 795 -------------------------------------- drivers/w1/dscore.h | 166 ------- drivers/w1/masters/Kconfig | 38 + drivers/w1/masters/Makefile | 11 drivers/w1/masters/ds_w1_bridge.c | 174 ++++++++ - drivers/w1/masters/dscore.c | 795 +++++++++++++++++++++++++++++++++++++ + drivers/w1/masters/dscore.c | 795 ++++++++++++++++++++++++++++++++++++++ drivers/w1/masters/dscore.h | 166 +++++++ drivers/w1/masters/matrox_w1.c | 247 +++++++++++ drivers/w1/matrox_w1.c | 247 ----------- @@ -31,7 +31,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> drivers/w1/w1_ds2433.c | 329 --------------- drivers/w1/w1_smem.c | 71 --- drivers/w1/w1_therm.c | 268 ------------ - 20 files changed, 2152 insertions(+), 2118 deletions(-) + 20 files changed, 2152 insertions(+), 2117 deletions(-) --- gregkh-2.6.orig/drivers/w1/Kconfig +++ gregkh-2.6/drivers/w1/Kconfig @@ -297,7 +297,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> -MODULE_AUTHOR("Evgeniy Polyakov <johnpol@2ka.mipt.ru>"); --- gregkh-2.6.orig/drivers/w1/dscore.c +++ /dev/null -@@ -1,796 +0,0 @@ +@@ -1,795 +0,0 @@ -/* - * dscore.c - * @@ -352,7 +352,6 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - - -static struct usb_driver ds_driver = { -- .owner = THIS_MODULE, - .name = "DS9490R", - .probe = ds_probe, - .disconnect = ds_disconnect, |