diff for duplicates of <10642734262308@kroah.com> diff --git a/a/1.txt b/N1/1.txt index 847d461..55bda00 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -99,7 +99,7 @@ diff -Nru a/drivers/i2c/busses/i2c-elektor.c b/drivers/i2c/busses/i2c-elektor.c + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ +/* ------------------------------------------------------------------------- */ + -+/* With some changes from Ky?sti M?lkki <kmalkki@cc.hut.fi> and even ++/* With some changes from Kyösti Mälkki <kmalkki@cc.hut.fi> and even + Frodo Looijaard <frodol@dds.nl> */ + +/* Partialy rewriten by Oleg I. Vdovikin for mmapped support of @@ -200,7 +200,7 @@ diff -Nru a/drivers/i2c/busses/i2c-elektor.c b/drivers/i2c/busses/i2c-elektor.c + + if (irq > 0) { + cli(); -+ if (pcf_pending = 0) { ++ if (pcf_pending == 0) { + interruptible_sleep_on_timeout(&pcf_wait, timeout*HZ ); + } else + pcf_pending = 0; @@ -265,9 +265,10 @@ diff -Nru a/drivers/i2c/busses/i2c-elektor.c b/drivers/i2c/busses/i2c-elektor.c +#ifdef __alpha__ + /* check to see we have memory mapped PCF8584 connected to the + Cypress cy82c693 PCI-ISA bridge as on UP2000 board */ -+ if (base = 0) { ++ if (base == 0) { + -+ struct pci_dev *cy693_dev + pci_find_device(PCI_VENDOR_ID_CONTAQ, ++ struct pci_dev *cy693_dev = ++ pci_find_device(PCI_VENDOR_ID_CONTAQ, + PCI_DEVICE_ID_CONTAQ_82C693, NULL); + + if (cy693_dev) { @@ -287,7 +288,7 @@ diff -Nru a/drivers/i2c/busses/i2c-elektor.c b/drivers/i2c/busses/i2c-elektor.c + /* so just check for ROMCS at 0xe0000, + ROMCS enabled for writes + and external XD Bus buffer in use. */ -+ if ((config & 0x7f) = 0x61) { ++ if ((config & 0x7f) == 0x61) { + /* seems to be UP2000 like board */ + base = 0xe0000; + /* I don't know why we need to @@ -312,7 +313,7 @@ diff -Nru a/drivers/i2c/busses/i2c-elektor.c b/drivers/i2c/busses/i2c-elektor.c + + printk(KERN_INFO "i2c-elektor.o: i2c pcf8584-isa adapter module version %s (%s)\n", I2C_VERSION, I2C_DATE); + -+ if (base = 0) { ++ if (base == 0) { + base = DEFAULT_BASE; + } + @@ -388,7 +389,7 @@ diff -Nru a/drivers/i2c/i2c-elektor.c b/drivers/i2c/i2c-elektor.c - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -/* ------------------------------------------------------------------------- */ - --/* With some changes from Ky?sti M?lkki <kmalkki@cc.hut.fi> and even +-/* With some changes from Kyösti Mälkki <kmalkki@cc.hut.fi> and even - Frodo Looijaard <frodol@dds.nl> */ - -/* Partialy rewriten by Oleg I. Vdovikin for mmapped support of @@ -489,7 +490,7 @@ diff -Nru a/drivers/i2c/i2c-elektor.c b/drivers/i2c/i2c-elektor.c - - if (irq > 0) { - cli(); -- if (pcf_pending = 0) { +- if (pcf_pending == 0) { - interruptible_sleep_on_timeout(&pcf_wait, timeout*HZ ); - } else - pcf_pending = 0; @@ -554,9 +555,10 @@ diff -Nru a/drivers/i2c/i2c-elektor.c b/drivers/i2c/i2c-elektor.c -#ifdef __alpha__ - /* check to see we have memory mapped PCF8584 connected to the - Cypress cy82c693 PCI-ISA bridge as on UP2000 board */ -- if (base = 0) { +- if (base == 0) { - -- struct pci_dev *cy693_dev - pci_find_device(PCI_VENDOR_ID_CONTAQ, +- struct pci_dev *cy693_dev = +- pci_find_device(PCI_VENDOR_ID_CONTAQ, - PCI_DEVICE_ID_CONTAQ_82C693, NULL); - - if (cy693_dev) { @@ -576,7 +578,7 @@ diff -Nru a/drivers/i2c/i2c-elektor.c b/drivers/i2c/i2c-elektor.c - /* so just check for ROMCS at 0xe0000, - ROMCS enabled for writes - and external XD Bus buffer in use. */ -- if ((config & 0x7f) = 0x61) { +- if ((config & 0x7f) == 0x61) { - /* seems to be UP2000 like board */ - base = 0xe0000; - /* I don't know why we need to @@ -601,7 +603,7 @@ diff -Nru a/drivers/i2c/i2c-elektor.c b/drivers/i2c/i2c-elektor.c - - printk(KERN_INFO "i2c-elektor.o: i2c pcf8584-isa adapter module version %s (%s)\n", I2C_VERSION, I2C_DATE); - -- if (base = 0) { +- if (base == 0) { - base = DEFAULT_BASE; - } - diff --git a/a/content_digest b/N1/content_digest index 92f5ed3..e124186 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,8 +1,7 @@ "ref\010642734262057@kroah.com\0" - "ref\01064273416272@kroah.com\0" - "From\0greg@kroah.com (Greg KH)\0" - "Subject\0[PATCH] i2c driver fixes for 2.6.0-test5\0" - "Date\0Thu, 19 May 2005 06:24:18 +0000\0" + "From\0Greg KH <greg@kroah.com>\0" + "Subject\0Re: [PATCH] i2c driver fixes for 2.6.0-test5\0" + "Date\0Mon, 22 Sep 2003 16:30:26 -0700\0" "To\0linux-kernel@vger.kernel.org" " sensors@stimpy.netroedge.com\0" "\00:1\0" @@ -108,7 +107,7 @@ "+ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.\t\t */\n" "+/* ------------------------------------------------------------------------- */\n" "+\n" - "+/* With some changes from Ky?sti M?lkki <kmalkki@cc.hut.fi> and even\n" + "+/* With some changes from Ky\303\266sti M\303\244lkki <kmalkki@cc.hut.fi> and even\n" "+ Frodo Looijaard <frodol@dds.nl> */\n" "+\n" "+/* Partialy rewriten by Oleg I. Vdovikin for mmapped support of \n" @@ -209,7 +208,7 @@ "+\n" "+\tif (irq > 0) {\n" "+\t\tcli();\n" - "+\t\tif (pcf_pending = 0) {\n" + "+\t\tif (pcf_pending == 0) {\n" "+\t\t\tinterruptible_sleep_on_timeout(&pcf_wait, timeout*HZ );\n" "+\t\t} else\n" "+\t\t\tpcf_pending = 0;\n" @@ -274,9 +273,10 @@ "+#ifdef __alpha__\n" "+\t/* check to see we have memory mapped PCF8584 connected to the \n" "+\tCypress cy82c693 PCI-ISA bridge as on UP2000 board */\n" - "+\tif (base = 0) {\n" + "+\tif (base == 0) {\n" "+\t\t\n" - "+\t\tstruct pci_dev *cy693_dev + pci_find_device(PCI_VENDOR_ID_CONTAQ, \n" + "+\t\tstruct pci_dev *cy693_dev =\n" + "+ pci_find_device(PCI_VENDOR_ID_CONTAQ, \n" "+\t\t PCI_DEVICE_ID_CONTAQ_82C693, NULL);\n" "+\n" "+\t\tif (cy693_dev) {\n" @@ -296,7 +296,7 @@ "+\t\t\t\t/* so just check for ROMCS at 0xe0000,\n" "+ ROMCS enabled for writes\n" "+\t\t\t\t and external XD Bus buffer in use. */\n" - "+\t\t\t\tif ((config & 0x7f) = 0x61) {\n" + "+\t\t\t\tif ((config & 0x7f) == 0x61) {\n" "+\t\t\t\t\t/* seems to be UP2000 like board */\n" "+\t\t\t\t\tbase = 0xe0000;\n" "+ /* I don't know why we need to\n" @@ -321,7 +321,7 @@ "+\n" "+\tprintk(KERN_INFO \"i2c-elektor.o: i2c pcf8584-isa adapter module version %s (%s)\\n\", I2C_VERSION, I2C_DATE);\n" "+\n" - "+\tif (base = 0) {\n" + "+\tif (base == 0) {\n" "+\t\tbase = DEFAULT_BASE;\n" "+\t}\n" "+\n" @@ -397,7 +397,7 @@ "- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.\t\t */\n" "-/* ------------------------------------------------------------------------- */\n" "-\n" - "-/* With some changes from Ky?sti M?lkki <kmalkki@cc.hut.fi> and even\n" + "-/* With some changes from Ky\303\266sti M\303\244lkki <kmalkki@cc.hut.fi> and even\n" "- Frodo Looijaard <frodol@dds.nl> */\n" "-\n" "-/* Partialy rewriten by Oleg I. Vdovikin for mmapped support of \n" @@ -498,7 +498,7 @@ "-\n" "-\tif (irq > 0) {\n" "-\t\tcli();\n" - "-\t\tif (pcf_pending = 0) {\n" + "-\t\tif (pcf_pending == 0) {\n" "-\t\t\tinterruptible_sleep_on_timeout(&pcf_wait, timeout*HZ );\n" "-\t\t} else\n" "-\t\t\tpcf_pending = 0;\n" @@ -563,9 +563,10 @@ "-#ifdef __alpha__\n" "-\t/* check to see we have memory mapped PCF8584 connected to the \n" "-\tCypress cy82c693 PCI-ISA bridge as on UP2000 board */\n" - "-\tif (base = 0) {\n" + "-\tif (base == 0) {\n" "-\t\t\n" - "-\t\tstruct pci_dev *cy693_dev - pci_find_device(PCI_VENDOR_ID_CONTAQ, \n" + "-\t\tstruct pci_dev *cy693_dev =\n" + "- pci_find_device(PCI_VENDOR_ID_CONTAQ, \n" "-\t\t PCI_DEVICE_ID_CONTAQ_82C693, NULL);\n" "-\n" "-\t\tif (cy693_dev) {\n" @@ -585,7 +586,7 @@ "-\t\t\t\t/* so just check for ROMCS at 0xe0000,\n" "- ROMCS enabled for writes\n" "-\t\t\t\t and external XD Bus buffer in use. */\n" - "-\t\t\t\tif ((config & 0x7f) = 0x61) {\n" + "-\t\t\t\tif ((config & 0x7f) == 0x61) {\n" "-\t\t\t\t\t/* seems to be UP2000 like board */\n" "-\t\t\t\t\tbase = 0xe0000;\n" "- /* I don't know why we need to\n" @@ -610,7 +611,7 @@ "-\n" "-\tprintk(KERN_INFO \"i2c-elektor.o: i2c pcf8584-isa adapter module version %s (%s)\\n\", I2C_VERSION, I2C_DATE);\n" "-\n" - "-\tif (base = 0) {\n" + "-\tif (base == 0) {\n" "-\t\tbase = DEFAULT_BASE;\n" "-\t}\n" "-\n" @@ -662,4 +663,4 @@ "-module_init(i2c_pcfisa_init);\n" -module_exit(i2c_pcfisa_exit); -b4184defe59ece534177272fb14152d60eaf203dde6421d99da71d1968f10bf5 +f62522bdd4a339128b2dba49d6f93123e870762f5e7a7edeb21693be54d6631a
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.