diff for duplicates of <20041023200215.38e375a1.khali@linux-fr.org> diff --git a/a/1.txt b/N1/1.txt index c601d0f..0e4024f 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -75,7 +75,8 @@ clear though, and at least now we have code to comment on ;) Thanks. Index: kernel/busses/Module.mk -=================================RCS file: /home/cvs/lm_sensors2/kernel/busses/Module.mk,v +=================================================================== +RCS file: /home/cvs/lm_sensors2/kernel/busses/Module.mk,v retrieving revision 1.48 diff -u -r1.48 Module.mk --- kernel/busses/Module.mk 16 Apr 2004 20:56:53 -0000 1.48 @@ -89,7 +90,8 @@ diff -u -r1.48 Module.mk ifneq ($(shell if grep -q '^CONFIG_I2C_I810=y' $(LINUX)/.config; then echo 1; fi),1) KERNELBUSSESTARGETS += $(MODULE_DIR)/i2c-i810.o Index: kernel/busses/i2c-i801-vaio.c -=================================RCS file: kernel/busses/i2c-i801-vaio.c +=================================================================== +RCS file: kernel/busses/i2c-i801-vaio.c diff -N kernel/busses/i2c-i801-vaio.c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ kernel/busses/i2c-i801-vaio.c 23 Oct 2004 18:24:17 -0000 @@ -133,7 +135,7 @@ diff -N kernel/busses/i2c-i801-vaio.c + + if (pci_find_subsys(PCI_VENDOR_ID_INTEL, + PCI_DEVICE_ID_INTEL_82801CA_3, -+ PCI_VENDOR_ID_SONY, 0x80e7, NULL) = NULL) { ++ PCI_VENDOR_ID_SONY, 0x80e7, NULL) == NULL) { + return -ENODEV; + } + @@ -188,7 +190,8 @@ diff -N kernel/busses/i2c-i801-vaio.c +module_init(i2c_i801_vaio_init); +module_exit(i2c_i801_vaio_exit); Index: kernel/busses/i2c-i801.c -=================================RCS file: /home/cvs/lm_sensors2/kernel/busses/i2c-i801.c,v +=================================================================== +RCS file: /home/cvs/lm_sensors2/kernel/busses/i2c-i801.c,v retrieving revision 1.36 diff -u -r1.36 i2c-i801.c --- kernel/busses/i2c-i801.c 22 May 2004 04:02:19 -0000 1.36 @@ -239,8 +242,8 @@ diff -u -r1.36 i2c-i801.c + if ((err = i2c_add_adapter(&i801_adapter))) + return err; + -+ if (dev->subsystem_vendor = PCI_VENDOR_ID_SONY -+ && dev->subsystem_device = 0x80e7) ++ if (dev->subsystem_vendor == PCI_VENDOR_ID_SONY ++ && dev->subsystem_device == 0x80e7) + request_module("i2c-i801-vaio"); + + return 0; diff --git a/a/content_digest b/N1/content_digest index 4ab1fcb..27d5533 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,6 +1,6 @@ - "From\0khali@linux-fr.org (Jean Delvare)\0" + "From\0Jean Delvare <khali@linux-fr.org>\0" "Subject\0More on SMBus multiplexing\0" - "Date\0Thu, 19 May 2005 06:25:20 +0000\0" + "Date\0Sat, 23 Oct 2004 20:02:15 +0200\0" "To\0LM Sensors <sensors@stimpy.netroedge.com>\0" "Cc\0Greg KH <greg@kroah.com>" " LKML <linux-kernel@vger.kernel.org>\0" @@ -83,7 +83,8 @@ "Thanks.\n" "\n" "Index: kernel/busses/Module.mk\n" - "=================================RCS file: /home/cvs/lm_sensors2/kernel/busses/Module.mk,v\n" + "===================================================================\n" + "RCS file: /home/cvs/lm_sensors2/kernel/busses/Module.mk,v\n" "retrieving revision 1.48\n" "diff -u -r1.48 Module.mk\n" "--- kernel/busses/Module.mk\t16 Apr 2004 20:56:53 -0000\t1.48\n" @@ -97,7 +98,8 @@ " ifneq ($(shell if grep -q '^CONFIG_I2C_I810=y' $(LINUX)/.config; then echo 1; fi),1)\n" " KERNELBUSSESTARGETS += $(MODULE_DIR)/i2c-i810.o\n" "Index: kernel/busses/i2c-i801-vaio.c\n" - "=================================RCS file: kernel/busses/i2c-i801-vaio.c\n" + "===================================================================\n" + "RCS file: kernel/busses/i2c-i801-vaio.c\n" "diff -N kernel/busses/i2c-i801-vaio.c\n" "--- /dev/null\t1 Jan 1970 00:00:00 -0000\n" "+++ kernel/busses/i2c-i801-vaio.c\t23 Oct 2004 18:24:17 -0000\n" @@ -141,7 +143,7 @@ "+\n" "+\tif (pci_find_subsys(PCI_VENDOR_ID_INTEL,\n" "+\t\t\t PCI_DEVICE_ID_INTEL_82801CA_3,\n" - "+\t\t\t PCI_VENDOR_ID_SONY, 0x80e7, NULL) = NULL) {\n" + "+\t\t\t PCI_VENDOR_ID_SONY, 0x80e7, NULL) == NULL) {\n" "+\t\treturn -ENODEV;\n" "+\t}\n" "+\n" @@ -196,7 +198,8 @@ "+module_init(i2c_i801_vaio_init);\n" "+module_exit(i2c_i801_vaio_exit);\n" "Index: kernel/busses/i2c-i801.c\n" - "=================================RCS file: /home/cvs/lm_sensors2/kernel/busses/i2c-i801.c,v\n" + "===================================================================\n" + "RCS file: /home/cvs/lm_sensors2/kernel/busses/i2c-i801.c,v\n" "retrieving revision 1.36\n" "diff -u -r1.36 i2c-i801.c\n" "--- kernel/busses/i2c-i801.c\t22 May 2004 04:02:19 -0000\t1.36\n" @@ -247,8 +250,8 @@ "+\tif ((err = i2c_add_adapter(&i801_adapter)))\n" "+\t\treturn err;\n" "+\n" - "+\tif (dev->subsystem_vendor = PCI_VENDOR_ID_SONY\n" - "+\t && dev->subsystem_device = 0x80e7)\n" + "+\tif (dev->subsystem_vendor == PCI_VENDOR_ID_SONY\n" + "+\t && dev->subsystem_device == 0x80e7)\n" "+\t \trequest_module(\"i2c-i801-vaio\");\n" "+\n" "+\treturn 0;\n" @@ -270,4 +273,4 @@ "Jean Delvare\n" http://khali.linux-fr.org/ -c54fbf3bd86e827254f7871601ad790dbd778285f4189896cc6b5e367c40a00c +9d8012d2ba0090a317fcb961451963abafd96d96ce40cba463276d661b9f9cdb
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.