diff for duplicates of <200504210227.36554.dtor_core@ameritech.net> diff --git a/a/1.txt b/N1/1.txt index d18536c..0be44e5 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -14,7 +14,8 @@ Signed-off-by: Dmitry Torokhov <dtor@mail.ru> 6 files changed, 42 insertions(+), 5 deletions(-) Index: dtor/drivers/w1/w1.c -=================================--- dtor.orig/drivers/w1/w1.c +=================================================================== +--- dtor.orig/drivers/w1/w1.c +++ dtor/drivers/w1/w1.c @@ -58,9 +58,11 @@ static int w1_bus_match(struct device *d */ @@ -22,16 +23,17 @@ Index: dtor/drivers/w1/w1.c struct w1_family *family = to_w1_family(drv); + struct w1_device_id *id; -- if (slave->reg_num.family = family->fid) +- if (slave->reg_num.family == family->fid) - return 1; + for (id = family->id_table; id->family; id++) -+ if (slave->reg_num.family = id->family) ++ if (slave->reg_num.family == id->family) + return 1; return 0; } Index: dtor/drivers/w1/w1.h -=================================--- dtor.orig/drivers/w1/w1.h +=================================================================== +--- dtor.orig/drivers/w1/w1.h +++ dtor/drivers/w1/w1.h @@ -41,6 +41,7 @@ struct w1_reg_num @@ -51,7 +53,8 @@ Index: dtor/drivers/w1/w1.h int (*join)(struct w1_slave *); Index: dtor/drivers/w1/w1_thermal.c -=================================--- dtor.orig/drivers/w1/w1_thermal.c +=================================================================== +--- dtor.orig/drivers/w1/w1_thermal.c +++ dtor/drivers/w1/w1_thermal.c @@ -50,11 +50,18 @@ static void w1_thermal_leave(struct w1_s device_remove_file(&slave->dev, &w1_thermal_temperature_attr); @@ -74,7 +77,8 @@ Index: dtor/drivers/w1/w1_thermal.c .join = w1_thermal_join, .leave = w1_thermal_leave, Index: dtor/drivers/w1/w1_sernum.c -=================================--- dtor.orig/drivers/w1/w1_sernum.c +=================================================================== +--- dtor.orig/drivers/w1/w1_sernum.c +++ dtor/drivers/w1/w1_sernum.c @@ -40,11 +40,18 @@ MODULE_DESCRIPTION("1-Wire Silicon Seria * by W1 core. @@ -97,7 +101,8 @@ Index: dtor/drivers/w1/w1_sernum.c }; Index: dtor/scripts/mod/file2alias.c -=================================--- dtor.orig/scripts/mod/file2alias.c +=================================================================== +--- dtor.orig/scripts/mod/file2alias.c +++ dtor/scripts/mod/file2alias.c @@ -25,6 +25,7 @@ typedef Elf64_Addr kernel_ulong_t; #include <stdint.h> @@ -137,7 +142,8 @@ Index: dtor/scripts/mod/file2alias.c do_table(symval, sym->st_size, sizeof(struct pnp_device_id), do_pnp_entry, mod); Index: dtor/include/linux/mod_devicetable.h -=================================--- dtor.orig/include/linux/mod_devicetable.h +=================================================================== +--- dtor.orig/include/linux/mod_devicetable.h +++ dtor/include/linux/mod_devicetable.h @@ -174,5 +174,9 @@ struct serio_device_id { __u8 proto; diff --git a/a/content_digest b/N1/content_digest index 06c6e48..29a3648 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\0200504210207.02421.dtor_core@ameritech.net\0" - "From\0dtor_core@ameritech.net (Dmitry Torokhov)\0" - "Subject\0[RFC/PATCH 20/22] W1: add w1_device_id/MODULE_DEVICE_TABLE for\0" - "Date\0Thu, 19 May 2005 06:25:53 +0000\0" + "From\0Dmitry Torokhov <dtor_core@ameritech.net>\0" + "Subject\0[RFC/PATCH 20/22] W1: add w1_device_id/MODULE_DEVICE_TABLE for automatic driver loading\0" + "Date\0Thu, 21 Apr 2005 02:27:36 -0500\0" "To\0sensors@stimpy.netroedge.com\0" "Cc\0LKML <linux-kernel@vger.kernel.org>" Greg KH <gregkh@suse.de> @@ -24,7 +24,8 @@ " 6 files changed, 42 insertions(+), 5 deletions(-)\n" "\n" "Index: dtor/drivers/w1/w1.c\n" - "=================================--- dtor.orig/drivers/w1/w1.c\n" + "===================================================================\n" + "--- dtor.orig/drivers/w1/w1.c\n" "+++ dtor/drivers/w1/w1.c\n" "@@ -58,9 +58,11 @@ static int w1_bus_match(struct device *d\n" " \t */\n" @@ -32,16 +33,17 @@ " \tstruct w1_family *family = to_w1_family(drv);\n" "+\tstruct w1_device_id *id;\n" " \n" - "-\tif (slave->reg_num.family = family->fid)\n" + "-\tif (slave->reg_num.family == family->fid)\n" "-\t\treturn 1;\n" "+\tfor (id = family->id_table; id->family; id++)\n" - "+\t\tif (slave->reg_num.family = id->family)\n" + "+\t\tif (slave->reg_num.family == id->family)\n" "+\t\t\treturn 1;\n" " \n" " \treturn 0;\n" " }\n" "Index: dtor/drivers/w1/w1.h\n" - "=================================--- dtor.orig/drivers/w1/w1.h\n" + "===================================================================\n" + "--- dtor.orig/drivers/w1/w1.h\n" "+++ dtor/drivers/w1/w1.h\n" "@@ -41,6 +41,7 @@ struct w1_reg_num\n" " \n" @@ -61,7 +63,8 @@ " \n" " \tint (*join)(struct w1_slave *);\n" "Index: dtor/drivers/w1/w1_thermal.c\n" - "=================================--- dtor.orig/drivers/w1/w1_thermal.c\n" + "===================================================================\n" + "--- dtor.orig/drivers/w1/w1_thermal.c\n" "+++ dtor/drivers/w1/w1_thermal.c\n" "@@ -50,11 +50,18 @@ static void w1_thermal_leave(struct w1_s\n" " \tdevice_remove_file(&slave->dev, &w1_thermal_temperature_attr);\n" @@ -84,7 +87,8 @@ " \t.join\t\t= w1_thermal_join,\n" " \t.leave\t\t= w1_thermal_leave,\n" "Index: dtor/drivers/w1/w1_sernum.c\n" - "=================================--- dtor.orig/drivers/w1/w1_sernum.c\n" + "===================================================================\n" + "--- dtor.orig/drivers/w1/w1_sernum.c\n" "+++ dtor/drivers/w1/w1_sernum.c\n" "@@ -40,11 +40,18 @@ MODULE_DESCRIPTION(\"1-Wire Silicon Seria\n" " * by W1 core.\n" @@ -107,7 +111,8 @@ " };\n" " \n" "Index: dtor/scripts/mod/file2alias.c\n" - "=================================--- dtor.orig/scripts/mod/file2alias.c\n" + "===================================================================\n" + "--- dtor.orig/scripts/mod/file2alias.c\n" "+++ dtor/scripts/mod/file2alias.c\n" "@@ -25,6 +25,7 @@ typedef Elf64_Addr\tkernel_ulong_t;\n" " #include <stdint.h>\n" @@ -147,7 +152,8 @@ " \t\tdo_table(symval, sym->st_size, sizeof(struct pnp_device_id),\n" " \t\t\t do_pnp_entry, mod);\n" "Index: dtor/include/linux/mod_devicetable.h\n" - "=================================--- dtor.orig/include/linux/mod_devicetable.h\n" + "===================================================================\n" + "--- dtor.orig/include/linux/mod_devicetable.h\n" "+++ dtor/include/linux/mod_devicetable.h\n" "@@ -174,5 +174,9 @@ struct serio_device_id {\n" " \t__u8 proto;\n" @@ -160,4 +166,4 @@ " \n" #endif /* LINUX_MOD_DEVICETABLE_H */ -0c1a8d8963c2fdce0007e75803236f0eb03ff48c801177f3964928d605e4f0fc +f3030e47b390b1c74bfb0d6297726b39da81ecd26a2199405937aaddcf4e5614
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.