diff for duplicates of <20050815175342.GC24959@litech.org> diff --git a/a/1.txt b/N1/1.txt index 0d8f0b7..62379b0 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -34,7 +34,8 @@ Signed-off-by: Nathan Lutchansky <lutchann@litech.org> 27 files changed, 79 insertions(+), 269 deletions(-) Index: linux-2.6.13-rc6+gregkh/drivers/hwmon/adm1021.c -=================================--- linux-2.6.13-rc6+gregkh.orig/drivers/hwmon/adm1021.c +=================================================================== +--- linux-2.6.13-rc6+gregkh.orig/drivers/hwmon/adm1021.c +++ linux-2.6.13-rc6+gregkh/drivers/hwmon/adm1021.c @@ -111,7 +111,6 @@ struct adm1021_data { u8 remote_temp_offset_prec; @@ -71,7 +72,8 @@ Index: linux-2.6.13-rc6+gregkh/drivers/hwmon/adm1021.c { int i; Index: linux-2.6.13-rc6+gregkh/drivers/hwmon/adm1025.c -=================================--- linux-2.6.13-rc6+gregkh.orig/drivers/hwmon/adm1025.c +=================================================================== +--- linux-2.6.13-rc6+gregkh.orig/drivers/hwmon/adm1025.c +++ linux-2.6.13-rc6+gregkh/drivers/hwmon/adm1025.c @@ -107,7 +107,6 @@ static int in_scale[6] = { 2500, 2250, 3 * Functions declaration @@ -108,7 +110,8 @@ Index: linux-2.6.13-rc6+gregkh/drivers/hwmon/adm1025.c * The following function does more than just detection. If detection * succeeds, it also registers the new chip. Index: linux-2.6.13-rc6+gregkh/drivers/hwmon/adm1026.c -=================================--- linux-2.6.13-rc6+gregkh.orig/drivers/hwmon/adm1026.c +=================================================================== +--- linux-2.6.13-rc6+gregkh.orig/drivers/hwmon/adm1026.c +++ linux-2.6.13-rc6+gregkh/drivers/hwmon/adm1026.c @@ -294,7 +294,6 @@ struct adm1026_data { u8 config3; /* Register value */ @@ -142,7 +145,8 @@ Index: linux-2.6.13-rc6+gregkh/drivers/hwmon/adm1026.c { struct adm1026_data *data = i2c_get_clientdata(client); Index: linux-2.6.13-rc6+gregkh/drivers/hwmon/adm1031.c -=================================--- linux-2.6.13-rc6+gregkh.orig/drivers/hwmon/adm1031.c +=================================================================== +--- linux-2.6.13-rc6+gregkh.orig/drivers/hwmon/adm1031.c +++ linux-2.6.13-rc6+gregkh/drivers/hwmon/adm1031.c @@ -97,7 +97,6 @@ struct adm1031_data { s8 temp_crit[3]; @@ -180,7 +184,8 @@ Index: linux-2.6.13-rc6+gregkh/drivers/hwmon/adm1031.c { struct i2c_client *new_client; Index: linux-2.6.13-rc6+gregkh/drivers/hwmon/adm9240.c -=================================--- linux-2.6.13-rc6+gregkh.orig/drivers/hwmon/adm9240.c +=================================================================== +--- linux-2.6.13-rc6+gregkh.orig/drivers/hwmon/adm9240.c +++ linux-2.6.13-rc6+gregkh/drivers/hwmon/adm9240.c @@ -129,7 +129,6 @@ static inline unsigned int AOUT_FROM_REG return SCALE(reg, 1250, 255); @@ -217,7 +222,8 @@ Index: linux-2.6.13-rc6+gregkh/drivers/hwmon/adm9240.c { struct adm9240_data *data = i2c_get_clientdata(client); Index: linux-2.6.13-rc6+gregkh/drivers/hwmon/asb100.c -=================================--- linux-2.6.13-rc6+gregkh.orig/drivers/hwmon/asb100.c +=================================================================== +--- linux-2.6.13-rc6+gregkh.orig/drivers/hwmon/asb100.c +++ linux-2.6.13-rc6+gregkh/drivers/hwmon/asb100.c @@ -210,7 +210,6 @@ struct asb100_data { static int asb100_read_value(struct i2c_client *client, u16 reg); @@ -227,7 +233,8 @@ Index: linux-2.6.13-rc6+gregkh/drivers/hwmon/asb100.c static int asb100_detect(struct i2c_adapter *adapter, int address, int kind); static int asb100_detach_client(struct i2c_client *client); static struct asb100_data *asb100_update_device(struct device *dev); -@@ -220,8 +219,10 @@ static struct i2c_driver asb100_driver .owner = THIS_MODULE, +@@ -220,8 +219,10 @@ static struct i2c_driver asb100_driver = + .owner = THIS_MODULE, .name = "asb100", .id = I2C_DRIVERID_ASB100, + .class = I2C_CLASS_HWMON, @@ -258,7 +265,8 @@ Index: linux-2.6.13-rc6+gregkh/drivers/hwmon/asb100.c int kind, struct i2c_client *new_client) { Index: linux-2.6.13-rc6+gregkh/drivers/hwmon/atxp1.c -=================================--- linux-2.6.13-rc6+gregkh.orig/drivers/hwmon/atxp1.c +=================================================================== +--- linux-2.6.13-rc6+gregkh.orig/drivers/hwmon/atxp1.c +++ linux-2.6.13-rc6+gregkh/drivers/hwmon/atxp1.c @@ -44,7 +44,6 @@ static unsigned short normal_i2c[] = { 0 @@ -291,7 +299,8 @@ Index: linux-2.6.13-rc6+gregkh/drivers/hwmon/atxp1.c { struct i2c_client * new_client; Index: linux-2.6.13-rc6+gregkh/drivers/hwmon/ds1621.c -=================================--- linux-2.6.13-rc6+gregkh.orig/drivers/hwmon/ds1621.c +=================================================================== +--- linux-2.6.13-rc6+gregkh.orig/drivers/hwmon/ds1621.c +++ linux-2.6.13-rc6+gregkh/drivers/hwmon/ds1621.c @@ -80,7 +80,6 @@ struct ds1621_data { u8 conf; /* Register encoding, combined */ @@ -301,7 +310,8 @@ Index: linux-2.6.13-rc6+gregkh/drivers/hwmon/ds1621.c static int ds1621_detect(struct i2c_adapter *adapter, int address, int kind); static void ds1621_init_client(struct i2c_client *client); -@@ -93,7 +92,8 @@ static struct i2c_driver ds1621_driver .name = "ds1621", +@@ -93,7 +92,8 @@ static struct i2c_driver ds1621_driver = + .name = "ds1621", .id = I2C_DRIVERID_DS1621, .flags = I2C_DF_NOTIFY, - .attach_adapter = ds1621_attach_adapter, @@ -324,7 +334,8 @@ Index: linux-2.6.13-rc6+gregkh/drivers/hwmon/ds1621.c int kind) { Index: linux-2.6.13-rc6+gregkh/drivers/hwmon/fscher.c -=================================--- linux-2.6.13-rc6+gregkh.orig/drivers/hwmon/fscher.c +=================================================================== +--- linux-2.6.13-rc6+gregkh.orig/drivers/hwmon/fscher.c +++ linux-2.6.13-rc6+gregkh/drivers/hwmon/fscher.c @@ -104,7 +104,6 @@ I2C_CLIENT_INSMOD_1(fscher); * Functions declaration @@ -334,7 +345,8 @@ Index: linux-2.6.13-rc6+gregkh/drivers/hwmon/fscher.c static int fscher_detect(struct i2c_adapter *adapter, int address, int kind); static int fscher_detach_client(struct i2c_client *client); static struct fscher_data *fscher_update_device(struct device *dev); -@@ -121,8 +120,10 @@ static struct i2c_driver fscher_driver .owner = THIS_MODULE, +@@ -121,8 +120,10 @@ static struct i2c_driver fscher_driver = + .owner = THIS_MODULE, .name = "fscher", .id = I2C_DRIVERID_FSCHER, + .class = I2C_CLASS_HWMON, @@ -360,7 +372,8 @@ Index: linux-2.6.13-rc6+gregkh/drivers/hwmon/fscher.c { struct i2c_client *new_client; Index: linux-2.6.13-rc6+gregkh/drivers/hwmon/fscpos.c -=================================--- linux-2.6.13-rc6+gregkh.orig/drivers/hwmon/fscpos.c +=================================================================== +--- linux-2.6.13-rc6+gregkh.orig/drivers/hwmon/fscpos.c +++ linux-2.6.13-rc6+gregkh/drivers/hwmon/fscpos.c @@ -85,7 +85,6 @@ static u8 FSCPOS_REG_TEMP_STATE[] = { 0x /* @@ -370,7 +383,8 @@ Index: linux-2.6.13-rc6+gregkh/drivers/hwmon/fscpos.c static int fscpos_detect(struct i2c_adapter *adapter, int address, int kind); static int fscpos_detach_client(struct i2c_client *client); -@@ -103,8 +102,10 @@ static struct i2c_driver fscpos_driver .owner = THIS_MODULE, +@@ -103,8 +102,10 @@ static struct i2c_driver fscpos_driver = + .owner = THIS_MODULE, .name = "fscpos", .id = I2C_DRIVERID_FSCPOS, + .class = I2C_CLASS_HWMON, @@ -396,7 +410,8 @@ Index: linux-2.6.13-rc6+gregkh/drivers/hwmon/fscpos.c { struct i2c_client *new_client; Index: linux-2.6.13-rc6+gregkh/drivers/hwmon/gl518sm.c -=================================--- linux-2.6.13-rc6+gregkh.orig/drivers/hwmon/gl518sm.c +=================================================================== +--- linux-2.6.13-rc6+gregkh.orig/drivers/hwmon/gl518sm.c +++ linux-2.6.13-rc6+gregkh/drivers/hwmon/gl518sm.c @@ -141,7 +141,6 @@ struct gl518_data { u8 beep_enable; /* Boolean */ @@ -433,7 +448,8 @@ Index: linux-2.6.13-rc6+gregkh/drivers/hwmon/gl518sm.c { int i; Index: linux-2.6.13-rc6+gregkh/drivers/hwmon/gl520sm.c -=================================--- linux-2.6.13-rc6+gregkh.orig/drivers/hwmon/gl520sm.c +=================================================================== +--- linux-2.6.13-rc6+gregkh.orig/drivers/hwmon/gl520sm.c +++ linux-2.6.13-rc6+gregkh/drivers/hwmon/gl520sm.c @@ -99,7 +99,6 @@ That's why _TEMP2 and _IN4 access the sa * Function declarations @@ -470,7 +486,8 @@ Index: linux-2.6.13-rc6+gregkh/drivers/hwmon/gl520sm.c { struct i2c_client *new_client; Index: linux-2.6.13-rc6+gregkh/drivers/hwmon/lm92.c -=================================--- linux-2.6.13-rc6+gregkh.orig/drivers/hwmon/lm92.c +=================================================================== +--- linux-2.6.13-rc6+gregkh.orig/drivers/hwmon/lm92.c +++ linux-2.6.13-rc6+gregkh/drivers/hwmon/lm92.c @@ -384,13 +384,6 @@ exit: return err; @@ -499,7 +516,8 @@ Index: linux-2.6.13-rc6+gregkh/drivers/hwmon/lm92.c }; Index: linux-2.6.13-rc6+gregkh/drivers/hwmon/it87.c -=================================--- linux-2.6.13-rc6+gregkh.orig/drivers/hwmon/it87.c +=================================================================== +--- linux-2.6.13-rc6+gregkh.orig/drivers/hwmon/it87.c +++ linux-2.6.13-rc6+gregkh/drivers/hwmon/it87.c @@ -220,7 +220,6 @@ struct it87_data { }; @@ -548,7 +566,8 @@ Index: linux-2.6.13-rc6+gregkh/drivers/hwmon/it87.c { int i; Index: linux-2.6.13-rc6+gregkh/drivers/hwmon/lm63.c -=================================--- linux-2.6.13-rc6+gregkh.orig/drivers/hwmon/lm63.c +=================================================================== +--- linux-2.6.13-rc6+gregkh.orig/drivers/hwmon/lm63.c +++ linux-2.6.13-rc6+gregkh/drivers/hwmon/lm63.c @@ -126,7 +126,6 @@ I2C_CLIENT_INSMOD_1(lm63); * Functions declaration @@ -585,7 +604,8 @@ Index: linux-2.6.13-rc6+gregkh/drivers/hwmon/lm63.c * The following function does more than just detection. If detection * succeeds, it also registers the new chip. Index: linux-2.6.13-rc6+gregkh/drivers/hwmon/lm75.c -=================================--- linux-2.6.13-rc6+gregkh.orig/drivers/hwmon/lm75.c +=================================================================== +--- linux-2.6.13-rc6+gregkh.orig/drivers/hwmon/lm75.c +++ linux-2.6.13-rc6+gregkh/drivers/hwmon/lm75.c @@ -55,7 +55,6 @@ struct lm75_data { u16 temp_hyst; @@ -623,7 +643,8 @@ Index: linux-2.6.13-rc6+gregkh/drivers/hwmon/lm75.c { int i; Index: linux-2.6.13-rc6+gregkh/drivers/hwmon/lm77.c -=================================--- linux-2.6.13-rc6+gregkh.orig/drivers/hwmon/lm77.c +=================================================================== +--- linux-2.6.13-rc6+gregkh.orig/drivers/hwmon/lm77.c +++ linux-2.6.13-rc6+gregkh/drivers/hwmon/lm77.c @@ -62,7 +62,6 @@ struct lm77_data { u8 alarms; @@ -661,7 +682,8 @@ Index: linux-2.6.13-rc6+gregkh/drivers/hwmon/lm77.c { struct i2c_client *new_client; Index: linux-2.6.13-rc6+gregkh/drivers/hwmon/lm78.c -=================================--- linux-2.6.13-rc6+gregkh.orig/drivers/hwmon/lm78.c +=================================================================== +--- linux-2.6.13-rc6+gregkh.orig/drivers/hwmon/lm78.c +++ linux-2.6.13-rc6+gregkh/drivers/hwmon/lm78.c @@ -152,7 +152,6 @@ struct lm78_data { }; @@ -708,7 +730,8 @@ Index: linux-2.6.13-rc6+gregkh/drivers/hwmon/lm78.c { int i, err; Index: linux-2.6.13-rc6+gregkh/drivers/hwmon/lm80.c -=================================--- linux-2.6.13-rc6+gregkh.orig/drivers/hwmon/lm80.c +=================================================================== +--- linux-2.6.13-rc6+gregkh.orig/drivers/hwmon/lm80.c +++ linux-2.6.13-rc6+gregkh/drivers/hwmon/lm80.c @@ -130,7 +130,6 @@ struct lm80_data { * Functions declaration @@ -745,7 +768,8 @@ Index: linux-2.6.13-rc6+gregkh/drivers/hwmon/lm80.c { int i, cur; Index: linux-2.6.13-rc6+gregkh/drivers/hwmon/lm83.c -=================================--- linux-2.6.13-rc6+gregkh.orig/drivers/hwmon/lm83.c +=================================================================== +--- linux-2.6.13-rc6+gregkh.orig/drivers/hwmon/lm83.c +++ linux-2.6.13-rc6+gregkh/drivers/hwmon/lm83.c @@ -114,7 +114,6 @@ static const u8 LM83_REG_W_HIGH[] = { * Functions declaration @@ -782,7 +806,8 @@ Index: linux-2.6.13-rc6+gregkh/drivers/hwmon/lm83.c * The following function does more than just detection. If detection * succeeds, it also registers the new chip. Index: linux-2.6.13-rc6+gregkh/drivers/hwmon/lm85.c -=================================--- linux-2.6.13-rc6+gregkh.orig/drivers/hwmon/lm85.c +=================================================================== +--- linux-2.6.13-rc6+gregkh.orig/drivers/hwmon/lm85.c +++ linux-2.6.13-rc6+gregkh/drivers/hwmon/lm85.c @@ -368,7 +368,6 @@ struct lm85_data { struct lm85_zone zone[3]; @@ -819,7 +844,8 @@ Index: linux-2.6.13-rc6+gregkh/drivers/hwmon/lm85.c int kind) { Index: linux-2.6.13-rc6+gregkh/drivers/hwmon/lm87.c -=================================--- linux-2.6.13-rc6+gregkh.orig/drivers/hwmon/lm87.c +=================================================================== +--- linux-2.6.13-rc6+gregkh.orig/drivers/hwmon/lm87.c +++ linux-2.6.13-rc6+gregkh/drivers/hwmon/lm87.c @@ -150,7 +150,6 @@ static u8 LM87_REG_TEMP_LOW[3] = { 0x3A, * Functions declaration @@ -856,7 +882,8 @@ Index: linux-2.6.13-rc6+gregkh/drivers/hwmon/lm87.c * The following function does more than just detection. If detection * succeeds, it also registers the new chip. Index: linux-2.6.13-rc6+gregkh/drivers/hwmon/lm90.c -=================================--- linux-2.6.13-rc6+gregkh.orig/drivers/hwmon/lm90.c +=================================================================== +--- linux-2.6.13-rc6+gregkh.orig/drivers/hwmon/lm90.c +++ linux-2.6.13-rc6+gregkh/drivers/hwmon/lm90.c @@ -174,7 +174,6 @@ I2C_CLIENT_INSMOD_6(lm90, adm1032, lm99, * Functions declaration @@ -893,7 +920,8 @@ Index: linux-2.6.13-rc6+gregkh/drivers/hwmon/lm90.c * The following function does more than just detection. If detection * succeeds, it also registers the new chip. Index: linux-2.6.13-rc6+gregkh/drivers/hwmon/max1619.c -=================================--- linux-2.6.13-rc6+gregkh.orig/drivers/hwmon/max1619.c +=================================================================== +--- linux-2.6.13-rc6+gregkh.orig/drivers/hwmon/max1619.c +++ linux-2.6.13-rc6+gregkh/drivers/hwmon/max1619.c @@ -78,7 +78,6 @@ I2C_CLIENT_INSMOD_1(max1619); * Functions declaration @@ -930,7 +958,8 @@ Index: linux-2.6.13-rc6+gregkh/drivers/hwmon/max1619.c * The following function does more than just detection. If detection * succeeds, it also registers the new chip. Index: linux-2.6.13-rc6+gregkh/drivers/hwmon/w83781d.c -=================================--- linux-2.6.13-rc6+gregkh.orig/drivers/hwmon/w83781d.c +=================================================================== +--- linux-2.6.13-rc6+gregkh.orig/drivers/hwmon/w83781d.c +++ linux-2.6.13-rc6+gregkh/drivers/hwmon/w83781d.c @@ -257,7 +257,6 @@ struct w83781d_data { u8 vrm; @@ -972,7 +1001,8 @@ Index: linux-2.6.13-rc6+gregkh/drivers/hwmon/w83781d.c w83781d_isa_attach_adapter(struct i2c_adapter *adapter) { Index: linux-2.6.13-rc6+gregkh/drivers/hwmon/w83792d.c -=================================--- linux-2.6.13-rc6+gregkh.orig/drivers/hwmon/w83792d.c +=================================================================== +--- linux-2.6.13-rc6+gregkh.orig/drivers/hwmon/w83792d.c +++ linux-2.6.13-rc6+gregkh/drivers/hwmon/w83792d.c @@ -300,7 +300,6 @@ struct w83792d_data { u8 sf2_levels[3][4]; /* Smart FanII: Fan1,2,3 duty cycle levels */ @@ -1015,7 +1045,8 @@ Index: linux-2.6.13-rc6+gregkh/drivers/hwmon/w83792d.c w83792d_create_subclient(struct i2c_adapter *adapter, struct i2c_client *new_client, int addr, Index: linux-2.6.13-rc6+gregkh/drivers/hwmon/w83l785ts.c -=================================--- linux-2.6.13-rc6+gregkh.orig/drivers/hwmon/w83l785ts.c +=================================================================== +--- linux-2.6.13-rc6+gregkh.orig/drivers/hwmon/w83l785ts.c +++ linux-2.6.13-rc6+gregkh/drivers/hwmon/w83l785ts.c @@ -79,7 +79,6 @@ I2C_CLIENT_INSMOD_1(w83l785ts); * Functions declaration diff --git a/a/content_digest b/N1/content_digest index d01daaa..8da5b7c 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\020050815175106.GA24959@litech.org\0" - "From\0lutchann@litech.org (Nathan Lutchansky)\0" - "Subject\0[lm-sensors] [PATCH 2/5] remove attach_adapter from i2c hwmon\0" - "Date\0Mon, 15 Aug 2005 19:54:22 +0000\0" + "From\0Nathan Lutchansky <lutchann@litech.org>\0" + "Subject\0[PATCH 2/5] remove attach_adapter from i2c hwmon drivers\0" + "Date\0Mon, 15 Aug 2005 13:53:42 -0400\0" "To\0LKML <linux-kernel@vger.kernel.org>" " lm-sensors <lm-sensors@lm-sensors.org>\0" "Cc\0Greg KH <greg@kroah.com>\0" @@ -43,7 +43,8 @@ " 27 files changed, 79 insertions(+), 269 deletions(-)\n" "\n" "Index: linux-2.6.13-rc6+gregkh/drivers/hwmon/adm1021.c\n" - "=================================--- linux-2.6.13-rc6+gregkh.orig/drivers/hwmon/adm1021.c\n" + "===================================================================\n" + "--- linux-2.6.13-rc6+gregkh.orig/drivers/hwmon/adm1021.c\n" "+++ linux-2.6.13-rc6+gregkh/drivers/hwmon/adm1021.c\n" "@@ -111,7 +111,6 @@ struct adm1021_data {\n" " \tu8\tremote_temp_offset_prec;\n" @@ -80,7 +81,8 @@ " {\n" " \tint i;\n" "Index: linux-2.6.13-rc6+gregkh/drivers/hwmon/adm1025.c\n" - "=================================--- linux-2.6.13-rc6+gregkh.orig/drivers/hwmon/adm1025.c\n" + "===================================================================\n" + "--- linux-2.6.13-rc6+gregkh.orig/drivers/hwmon/adm1025.c\n" "+++ linux-2.6.13-rc6+gregkh/drivers/hwmon/adm1025.c\n" "@@ -107,7 +107,6 @@ static int in_scale[6] = { 2500, 2250, 3\n" " * Functions declaration\n" @@ -117,7 +119,8 @@ " * The following function does more than just detection. If detection\n" " * succeeds, it also registers the new chip.\n" "Index: linux-2.6.13-rc6+gregkh/drivers/hwmon/adm1026.c\n" - "=================================--- linux-2.6.13-rc6+gregkh.orig/drivers/hwmon/adm1026.c\n" + "===================================================================\n" + "--- linux-2.6.13-rc6+gregkh.orig/drivers/hwmon/adm1026.c\n" "+++ linux-2.6.13-rc6+gregkh/drivers/hwmon/adm1026.c\n" "@@ -294,7 +294,6 @@ struct adm1026_data {\n" " \tu8 config3; /* Register value */\n" @@ -151,7 +154,8 @@ " {\n" " \tstruct adm1026_data *data = i2c_get_clientdata(client);\n" "Index: linux-2.6.13-rc6+gregkh/drivers/hwmon/adm1031.c\n" - "=================================--- linux-2.6.13-rc6+gregkh.orig/drivers/hwmon/adm1031.c\n" + "===================================================================\n" + "--- linux-2.6.13-rc6+gregkh.orig/drivers/hwmon/adm1031.c\n" "+++ linux-2.6.13-rc6+gregkh/drivers/hwmon/adm1031.c\n" "@@ -97,7 +97,6 @@ struct adm1031_data {\n" " \ts8 temp_crit[3];\n" @@ -189,7 +193,8 @@ " {\n" " \tstruct i2c_client *new_client;\n" "Index: linux-2.6.13-rc6+gregkh/drivers/hwmon/adm9240.c\n" - "=================================--- linux-2.6.13-rc6+gregkh.orig/drivers/hwmon/adm9240.c\n" + "===================================================================\n" + "--- linux-2.6.13-rc6+gregkh.orig/drivers/hwmon/adm9240.c\n" "+++ linux-2.6.13-rc6+gregkh/drivers/hwmon/adm9240.c\n" "@@ -129,7 +129,6 @@ static inline unsigned int AOUT_FROM_REG\n" " \treturn SCALE(reg, 1250, 255);\n" @@ -226,7 +231,8 @@ " {\n" " \tstruct adm9240_data *data = i2c_get_clientdata(client);\n" "Index: linux-2.6.13-rc6+gregkh/drivers/hwmon/asb100.c\n" - "=================================--- linux-2.6.13-rc6+gregkh.orig/drivers/hwmon/asb100.c\n" + "===================================================================\n" + "--- linux-2.6.13-rc6+gregkh.orig/drivers/hwmon/asb100.c\n" "+++ linux-2.6.13-rc6+gregkh/drivers/hwmon/asb100.c\n" "@@ -210,7 +210,6 @@ struct asb100_data {\n" " static int asb100_read_value(struct i2c_client *client, u16 reg);\n" @@ -236,7 +242,8 @@ " static int asb100_detect(struct i2c_adapter *adapter, int address, int kind);\n" " static int asb100_detach_client(struct i2c_client *client);\n" " static struct asb100_data *asb100_update_device(struct device *dev);\n" - "@@ -220,8 +219,10 @@ static struct i2c_driver asb100_driver \t.owner\t\t= THIS_MODULE,\n" + "@@ -220,8 +219,10 @@ static struct i2c_driver asb100_driver =\n" + " \t.owner\t\t= THIS_MODULE,\n" " \t.name\t\t= \"asb100\",\n" " \t.id\t\t= I2C_DRIVERID_ASB100,\n" "+\t.class\t\t= I2C_CLASS_HWMON,\n" @@ -267,7 +274,8 @@ " \t\tint kind, struct i2c_client *new_client)\n" " {\n" "Index: linux-2.6.13-rc6+gregkh/drivers/hwmon/atxp1.c\n" - "=================================--- linux-2.6.13-rc6+gregkh.orig/drivers/hwmon/atxp1.c\n" + "===================================================================\n" + "--- linux-2.6.13-rc6+gregkh.orig/drivers/hwmon/atxp1.c\n" "+++ linux-2.6.13-rc6+gregkh/drivers/hwmon/atxp1.c\n" "@@ -44,7 +44,6 @@ static unsigned short normal_i2c[] = { 0\n" " \n" @@ -300,7 +308,8 @@ " {\n" " \tstruct i2c_client * new_client;\n" "Index: linux-2.6.13-rc6+gregkh/drivers/hwmon/ds1621.c\n" - "=================================--- linux-2.6.13-rc6+gregkh.orig/drivers/hwmon/ds1621.c\n" + "===================================================================\n" + "--- linux-2.6.13-rc6+gregkh.orig/drivers/hwmon/ds1621.c\n" "+++ linux-2.6.13-rc6+gregkh/drivers/hwmon/ds1621.c\n" "@@ -80,7 +80,6 @@ struct ds1621_data {\n" " \tu8 conf;\t\t\t/* Register encoding, combined */\n" @@ -310,7 +319,8 @@ " static int ds1621_detect(struct i2c_adapter *adapter, int address,\n" " \t\t\t int kind);\n" " static void ds1621_init_client(struct i2c_client *client);\n" - "@@ -93,7 +92,8 @@ static struct i2c_driver ds1621_driver \t.name\t\t= \"ds1621\",\n" + "@@ -93,7 +92,8 @@ static struct i2c_driver ds1621_driver =\n" + " \t.name\t\t= \"ds1621\",\n" " \t.id\t\t= I2C_DRIVERID_DS1621,\n" " \t.flags\t\t= I2C_DF_NOTIFY,\n" "-\t.attach_adapter\t= ds1621_attach_adapter,\n" @@ -333,7 +343,8 @@ " int kind)\n" " {\n" "Index: linux-2.6.13-rc6+gregkh/drivers/hwmon/fscher.c\n" - "=================================--- linux-2.6.13-rc6+gregkh.orig/drivers/hwmon/fscher.c\n" + "===================================================================\n" + "--- linux-2.6.13-rc6+gregkh.orig/drivers/hwmon/fscher.c\n" "+++ linux-2.6.13-rc6+gregkh/drivers/hwmon/fscher.c\n" "@@ -104,7 +104,6 @@ I2C_CLIENT_INSMOD_1(fscher);\n" " * Functions declaration\n" @@ -343,7 +354,8 @@ " static int fscher_detect(struct i2c_adapter *adapter, int address, int kind);\n" " static int fscher_detach_client(struct i2c_client *client);\n" " static struct fscher_data *fscher_update_device(struct device *dev);\n" - "@@ -121,8 +120,10 @@ static struct i2c_driver fscher_driver \t.owner\t\t= THIS_MODULE,\n" + "@@ -121,8 +120,10 @@ static struct i2c_driver fscher_driver =\n" + " \t.owner\t\t= THIS_MODULE,\n" " \t.name\t\t= \"fscher\",\n" " \t.id\t\t= I2C_DRIVERID_FSCHER,\n" "+\t.class\t\t= I2C_CLASS_HWMON,\n" @@ -369,7 +381,8 @@ " {\n" " \tstruct i2c_client *new_client;\n" "Index: linux-2.6.13-rc6+gregkh/drivers/hwmon/fscpos.c\n" - "=================================--- linux-2.6.13-rc6+gregkh.orig/drivers/hwmon/fscpos.c\n" + "===================================================================\n" + "--- linux-2.6.13-rc6+gregkh.orig/drivers/hwmon/fscpos.c\n" "+++ linux-2.6.13-rc6+gregkh/drivers/hwmon/fscpos.c\n" "@@ -85,7 +85,6 @@ static u8 FSCPOS_REG_TEMP_STATE[] = { 0x\n" " /*\n" @@ -379,7 +392,8 @@ " static int fscpos_detect(struct i2c_adapter *adapter, int address, int kind);\n" " static int fscpos_detach_client(struct i2c_client *client);\n" " \n" - "@@ -103,8 +102,10 @@ static struct i2c_driver fscpos_driver \t.owner\t\t= THIS_MODULE,\n" + "@@ -103,8 +102,10 @@ static struct i2c_driver fscpos_driver =\n" + " \t.owner\t\t= THIS_MODULE,\n" " \t.name\t\t= \"fscpos\",\n" " \t.id\t\t= I2C_DRIVERID_FSCPOS,\n" "+\t.class\t\t= I2C_CLASS_HWMON,\n" @@ -405,7 +419,8 @@ " {\n" " \tstruct i2c_client *new_client;\n" "Index: linux-2.6.13-rc6+gregkh/drivers/hwmon/gl518sm.c\n" - "=================================--- linux-2.6.13-rc6+gregkh.orig/drivers/hwmon/gl518sm.c\n" + "===================================================================\n" + "--- linux-2.6.13-rc6+gregkh.orig/drivers/hwmon/gl518sm.c\n" "+++ linux-2.6.13-rc6+gregkh/drivers/hwmon/gl518sm.c\n" "@@ -141,7 +141,6 @@ struct gl518_data {\n" " \tu8 beep_enable;\t\t/* Boolean */\n" @@ -442,7 +457,8 @@ " {\n" " \tint i;\n" "Index: linux-2.6.13-rc6+gregkh/drivers/hwmon/gl520sm.c\n" - "=================================--- linux-2.6.13-rc6+gregkh.orig/drivers/hwmon/gl520sm.c\n" + "===================================================================\n" + "--- linux-2.6.13-rc6+gregkh.orig/drivers/hwmon/gl520sm.c\n" "+++ linux-2.6.13-rc6+gregkh/drivers/hwmon/gl520sm.c\n" "@@ -99,7 +99,6 @@ That's why _TEMP2 and _IN4 access the sa\n" " * Function declarations\n" @@ -479,7 +495,8 @@ " {\n" " \tstruct i2c_client *new_client;\n" "Index: linux-2.6.13-rc6+gregkh/drivers/hwmon/lm92.c\n" - "=================================--- linux-2.6.13-rc6+gregkh.orig/drivers/hwmon/lm92.c\n" + "===================================================================\n" + "--- linux-2.6.13-rc6+gregkh.orig/drivers/hwmon/lm92.c\n" "+++ linux-2.6.13-rc6+gregkh/drivers/hwmon/lm92.c\n" "@@ -384,13 +384,6 @@ exit:\n" " \treturn err;\n" @@ -508,7 +525,8 @@ " };\n" " \n" "Index: linux-2.6.13-rc6+gregkh/drivers/hwmon/it87.c\n" - "=================================--- linux-2.6.13-rc6+gregkh.orig/drivers/hwmon/it87.c\n" + "===================================================================\n" + "--- linux-2.6.13-rc6+gregkh.orig/drivers/hwmon/it87.c\n" "+++ linux-2.6.13-rc6+gregkh/drivers/hwmon/it87.c\n" "@@ -220,7 +220,6 @@ struct it87_data {\n" " };\n" @@ -557,7 +575,8 @@ " {\n" " \tint i;\n" "Index: linux-2.6.13-rc6+gregkh/drivers/hwmon/lm63.c\n" - "=================================--- linux-2.6.13-rc6+gregkh.orig/drivers/hwmon/lm63.c\n" + "===================================================================\n" + "--- linux-2.6.13-rc6+gregkh.orig/drivers/hwmon/lm63.c\n" "+++ linux-2.6.13-rc6+gregkh/drivers/hwmon/lm63.c\n" "@@ -126,7 +126,6 @@ I2C_CLIENT_INSMOD_1(lm63);\n" " * Functions declaration\n" @@ -594,7 +613,8 @@ " * The following function does more than just detection. If detection\n" " * succeeds, it also registers the new chip.\n" "Index: linux-2.6.13-rc6+gregkh/drivers/hwmon/lm75.c\n" - "=================================--- linux-2.6.13-rc6+gregkh.orig/drivers/hwmon/lm75.c\n" + "===================================================================\n" + "--- linux-2.6.13-rc6+gregkh.orig/drivers/hwmon/lm75.c\n" "+++ linux-2.6.13-rc6+gregkh/drivers/hwmon/lm75.c\n" "@@ -55,7 +55,6 @@ struct lm75_data {\n" " \tu16\t\t\ttemp_hyst;\n" @@ -632,7 +652,8 @@ " {\n" " \tint i;\n" "Index: linux-2.6.13-rc6+gregkh/drivers/hwmon/lm77.c\n" - "=================================--- linux-2.6.13-rc6+gregkh.orig/drivers/hwmon/lm77.c\n" + "===================================================================\n" + "--- linux-2.6.13-rc6+gregkh.orig/drivers/hwmon/lm77.c\n" "+++ linux-2.6.13-rc6+gregkh/drivers/hwmon/lm77.c\n" "@@ -62,7 +62,6 @@ struct lm77_data {\n" " \tu8\t\t\talarms;\n" @@ -670,7 +691,8 @@ " {\n" " \tstruct i2c_client *new_client;\n" "Index: linux-2.6.13-rc6+gregkh/drivers/hwmon/lm78.c\n" - "=================================--- linux-2.6.13-rc6+gregkh.orig/drivers/hwmon/lm78.c\n" + "===================================================================\n" + "--- linux-2.6.13-rc6+gregkh.orig/drivers/hwmon/lm78.c\n" "+++ linux-2.6.13-rc6+gregkh/drivers/hwmon/lm78.c\n" "@@ -152,7 +152,6 @@ struct lm78_data {\n" " };\n" @@ -717,7 +739,8 @@ " {\n" " \tint i, err;\n" "Index: linux-2.6.13-rc6+gregkh/drivers/hwmon/lm80.c\n" - "=================================--- linux-2.6.13-rc6+gregkh.orig/drivers/hwmon/lm80.c\n" + "===================================================================\n" + "--- linux-2.6.13-rc6+gregkh.orig/drivers/hwmon/lm80.c\n" "+++ linux-2.6.13-rc6+gregkh/drivers/hwmon/lm80.c\n" "@@ -130,7 +130,6 @@ struct lm80_data {\n" " * Functions declaration\n" @@ -754,7 +777,8 @@ " {\n" " \tint i, cur;\n" "Index: linux-2.6.13-rc6+gregkh/drivers/hwmon/lm83.c\n" - "=================================--- linux-2.6.13-rc6+gregkh.orig/drivers/hwmon/lm83.c\n" + "===================================================================\n" + "--- linux-2.6.13-rc6+gregkh.orig/drivers/hwmon/lm83.c\n" "+++ linux-2.6.13-rc6+gregkh/drivers/hwmon/lm83.c\n" "@@ -114,7 +114,6 @@ static const u8 LM83_REG_W_HIGH[] = {\n" " * Functions declaration\n" @@ -791,7 +815,8 @@ " * The following function does more than just detection. If detection\n" " * succeeds, it also registers the new chip.\n" "Index: linux-2.6.13-rc6+gregkh/drivers/hwmon/lm85.c\n" - "=================================--- linux-2.6.13-rc6+gregkh.orig/drivers/hwmon/lm85.c\n" + "===================================================================\n" + "--- linux-2.6.13-rc6+gregkh.orig/drivers/hwmon/lm85.c\n" "+++ linux-2.6.13-rc6+gregkh/drivers/hwmon/lm85.c\n" "@@ -368,7 +368,6 @@ struct lm85_data {\n" " \tstruct lm85_zone zone[3];\n" @@ -828,7 +853,8 @@ " \t\tint kind)\n" " {\n" "Index: linux-2.6.13-rc6+gregkh/drivers/hwmon/lm87.c\n" - "=================================--- linux-2.6.13-rc6+gregkh.orig/drivers/hwmon/lm87.c\n" + "===================================================================\n" + "--- linux-2.6.13-rc6+gregkh.orig/drivers/hwmon/lm87.c\n" "+++ linux-2.6.13-rc6+gregkh/drivers/hwmon/lm87.c\n" "@@ -150,7 +150,6 @@ static u8 LM87_REG_TEMP_LOW[3] = { 0x3A,\n" " * Functions declaration\n" @@ -865,7 +891,8 @@ " * The following function does more than just detection. If detection\n" " * succeeds, it also registers the new chip.\n" "Index: linux-2.6.13-rc6+gregkh/drivers/hwmon/lm90.c\n" - "=================================--- linux-2.6.13-rc6+gregkh.orig/drivers/hwmon/lm90.c\n" + "===================================================================\n" + "--- linux-2.6.13-rc6+gregkh.orig/drivers/hwmon/lm90.c\n" "+++ linux-2.6.13-rc6+gregkh/drivers/hwmon/lm90.c\n" "@@ -174,7 +174,6 @@ I2C_CLIENT_INSMOD_6(lm90, adm1032, lm99,\n" " * Functions declaration\n" @@ -902,7 +929,8 @@ " * The following function does more than just detection. If detection\n" " * succeeds, it also registers the new chip.\n" "Index: linux-2.6.13-rc6+gregkh/drivers/hwmon/max1619.c\n" - "=================================--- linux-2.6.13-rc6+gregkh.orig/drivers/hwmon/max1619.c\n" + "===================================================================\n" + "--- linux-2.6.13-rc6+gregkh.orig/drivers/hwmon/max1619.c\n" "+++ linux-2.6.13-rc6+gregkh/drivers/hwmon/max1619.c\n" "@@ -78,7 +78,6 @@ I2C_CLIENT_INSMOD_1(max1619);\n" " * Functions declaration\n" @@ -939,7 +967,8 @@ " * The following function does more than just detection. If detection\n" " * succeeds, it also registers the new chip.\n" "Index: linux-2.6.13-rc6+gregkh/drivers/hwmon/w83781d.c\n" - "=================================--- linux-2.6.13-rc6+gregkh.orig/drivers/hwmon/w83781d.c\n" + "===================================================================\n" + "--- linux-2.6.13-rc6+gregkh.orig/drivers/hwmon/w83781d.c\n" "+++ linux-2.6.13-rc6+gregkh/drivers/hwmon/w83781d.c\n" "@@ -257,7 +257,6 @@ struct w83781d_data {\n" " \tu8 vrm;\n" @@ -981,7 +1010,8 @@ " w83781d_isa_attach_adapter(struct i2c_adapter *adapter)\n" " {\n" "Index: linux-2.6.13-rc6+gregkh/drivers/hwmon/w83792d.c\n" - "=================================--- linux-2.6.13-rc6+gregkh.orig/drivers/hwmon/w83792d.c\n" + "===================================================================\n" + "--- linux-2.6.13-rc6+gregkh.orig/drivers/hwmon/w83792d.c\n" "+++ linux-2.6.13-rc6+gregkh/drivers/hwmon/w83792d.c\n" "@@ -300,7 +300,6 @@ struct w83792d_data {\n" " \tu8 sf2_levels[3][4];\t/* Smart FanII: Fan1,2,3 duty cycle levels */\n" @@ -1024,7 +1054,8 @@ " w83792d_create_subclient(struct i2c_adapter *adapter,\n" " \t\t\t\tstruct i2c_client *new_client, int addr,\n" "Index: linux-2.6.13-rc6+gregkh/drivers/hwmon/w83l785ts.c\n" - "=================================--- linux-2.6.13-rc6+gregkh.orig/drivers/hwmon/w83l785ts.c\n" + "===================================================================\n" + "--- linux-2.6.13-rc6+gregkh.orig/drivers/hwmon/w83l785ts.c\n" "+++ linux-2.6.13-rc6+gregkh/drivers/hwmon/w83l785ts.c\n" "@@ -79,7 +79,6 @@ I2C_CLIENT_INSMOD_1(w83l785ts);\n" " * Functions declaration\n" @@ -1061,4 +1092,4 @@ " * The following function does more than just detection. If detection\n" * succeeds, it also registers the new chip. -2cf353744af0e9134c2bed5eaeb98d7cfce5aa7e0859c6d7def11cb9323c96bb +32a94b12be608f1fcab2e9ece751693cf5d445ef400bbe49b1ae808e79b90d59
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.