diff for duplicates of <20031224233210.4573f541.khali@linux-fr.org> diff --git a/a/1.txt b/N1/1.txt index 99ceb29..ec6cde9 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -2,7 +2,7 @@ This patch drops almost all compatibility stuff that was leftover from times of kernel 2.2. A few extra includes may have survived, we will take care of them later. -Most of the work was done by Ky?sti M?lkki. Original comment follows: +Most of the work was done by Kyösti Mälkki. Original comment follows: *** Remove code for KERNEL_VERSION tests. *** @@ -32,7 +32,7 @@ diff -r -U1 linux-2.4.24-pre2-k1/drivers/i2c/i2c-adap-ite.c linux-2.4.24-pre2-k2 -#if (LINUX_VERSION_CODE >= 0x020301) - init_waitqueue_head(&iic_wait); -#endif - if (iic_hw_resrc_init() = 0) { + if (iic_hw_resrc_init() == 0) { diff -r -U1 linux-2.4.24-pre2-k1/drivers/i2c/i2c-algo-bit.c linux-2.4.24-pre2-k2/drivers/i2c/i2c-algo-bit.c --- linux-2.4.24-pre2-k1/drivers/i2c/i2c-algo-bit.c Mon Dec 22 22:04:00 2003 +++ linux-2.4.24-pre2-k2/drivers/i2c/i2c-algo-bit.c Tue Dec 23 19:02:05 2003 @@ -202,7 +202,7 @@ diff -r -U1 linux-2.4.24-pre2-k1/drivers/i2c/i2c-elektor.c linux-2.4.24-pre2-k2/ -#if (LINUX_VERSION_CODE >= 0x020301) init_waitqueue_head(&pcf_wait); -#endif - if (pcf_isa_init() = 0) { + if (pcf_isa_init() == 0) { diff -r -U1 linux-2.4.24-pre2-k1/drivers/i2c/i2c-elv.c linux-2.4.24-pre2-k2/drivers/i2c/i2c-elv.c --- linux-2.4.24-pre2-k1/drivers/i2c/i2c-elv.c Mon Dec 22 22:04:00 2003 +++ linux-2.4.24-pre2-k2/drivers/i2c/i2c-elv.c Tue Dec 23 19:02:05 2003 @@ -271,7 +271,8 @@ diff -r -U1 linux-2.4.24-pre2-k1/drivers/i2c/i2c-proc.c linux-2.4.24-pre2-k2/dri -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,3,27)) new_header->ctl_table->child->child->de->owner = controlling_mod; -#else -- new_header->ctl_table->child->child->de->fill_inode - &i2c_dir_fill_inode; +- new_header->ctl_table->child->child->de->fill_inode = +- &i2c_dir_fill_inode; -#endif /* (LINUX_VERSION_CODE >= KERNEL_VERSION(2,3,27)) */ @@ -863,8 +853,3 @@ @@ -279,7 +280,8 @@ diff -r -U1 linux-2.4.24-pre2-k1/drivers/i2c/i2c-proc.c linux-2.4.24-pre2-k2/dri -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,3,1)) i2c_proc_header->ctl_table->child->de->owner = THIS_MODULE; -#else -- i2c_proc_header->ctl_table->child->de->fill_inode - &i2c_fill_inode; +- i2c_proc_header->ctl_table->child->de->fill_inode = +- &i2c_fill_inode; -#endif /* (LINUX_VERSION_CODE >= KERNEL_VERSION(2,3,1)) */ i2c_initialized++; diff -r -U1 linux-2.4.24-pre2-k1/include/linux/i2c.h linux-2.4.24-pre2-k2/include/linux/i2c.h diff --git a/a/content_digest b/N1/content_digest index a5b724d..9d633ff 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\020031224225707.749707e5.khali@linux-fr.org\0" - "From\0khali@linux-fr.org (Jean Delvare)\0" + "From\0Jean Delvare <khali@linux-fr.org>\0" "Subject\0[PATCH 2.4] i2c cleanups, second wave (2/5)\0" - "Date\0Thu, 19 May 2005 06:24:31 +0000\0" + "Date\0Wed, 24 Dec 2003 23:32:10 +0100\0" "To\0Marcelo Tosatti <marcelo.tosatti@cyclades.com>\0" "Cc\0LKML <linux-kernel@vger.kernel.org>" " LM Sensors <sensors@stimpy.netroedge.com>\0" @@ -11,7 +11,7 @@ "times of kernel 2.2. A few extra includes may have survived, we will\n" "take care of them later.\n" "\n" - "Most of the work was done by Ky?sti M?lkki. Original comment follows:\n" + "Most of the work was done by Ky\303\266sti M\303\244lkki. Original comment follows:\n" "***\n" "Remove code for KERNEL_VERSION tests.\n" "***\n" @@ -41,7 +41,7 @@ "-#if (LINUX_VERSION_CODE >= 0x020301)\n" "-\tinit_waitqueue_head(&iic_wait);\n" "-#endif\n" - " \tif (iic_hw_resrc_init() = 0) {\n" + " \tif (iic_hw_resrc_init() == 0) {\n" "diff -r -U1 linux-2.4.24-pre2-k1/drivers/i2c/i2c-algo-bit.c linux-2.4.24-pre2-k2/drivers/i2c/i2c-algo-bit.c\n" "--- linux-2.4.24-pre2-k1/drivers/i2c/i2c-algo-bit.c\tMon Dec 22 22:04:00 2003\n" "+++ linux-2.4.24-pre2-k2/drivers/i2c/i2c-algo-bit.c\tTue Dec 23 19:02:05 2003\n" @@ -211,7 +211,7 @@ "-#if (LINUX_VERSION_CODE >= 0x020301)\n" " \tinit_waitqueue_head(&pcf_wait);\n" "-#endif\n" - " \tif (pcf_isa_init() = 0) {\n" + " \tif (pcf_isa_init() == 0) {\n" "diff -r -U1 linux-2.4.24-pre2-k1/drivers/i2c/i2c-elv.c linux-2.4.24-pre2-k2/drivers/i2c/i2c-elv.c\n" "--- linux-2.4.24-pre2-k1/drivers/i2c/i2c-elv.c\tMon Dec 22 22:04:00 2003\n" "+++ linux-2.4.24-pre2-k2/drivers/i2c/i2c-elv.c\tTue Dec 23 19:02:05 2003\n" @@ -280,7 +280,8 @@ "-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,3,27))\n" " \tnew_header->ctl_table->child->child->de->owner = controlling_mod;\n" "-#else\n" - "-\tnew_header->ctl_table->child->child->de->fill_inode -\t &i2c_dir_fill_inode;\n" + "-\tnew_header->ctl_table->child->child->de->fill_inode =\n" + "-\t &i2c_dir_fill_inode;\n" "-#endif\t/* (LINUX_VERSION_CODE >= KERNEL_VERSION(2,3,27)) */\n" " \n" "@@ -863,8 +853,3 @@\n" @@ -288,7 +289,8 @@ "-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,3,1))\n" " \ti2c_proc_header->ctl_table->child->de->owner = THIS_MODULE;\n" "-#else\n" - "-\ti2c_proc_header->ctl_table->child->de->fill_inode -\t &i2c_fill_inode;\n" + "-\ti2c_proc_header->ctl_table->child->de->fill_inode =\n" + "-\t &i2c_fill_inode;\n" "-#endif\t\t\t/* (LINUX_VERSION_CODE >= KERNEL_VERSION(2,3,1)) */\n" " \ti2c_initialized++;\n" "diff -r -U1 linux-2.4.24-pre2-k1/include/linux/i2c.h linux-2.4.24-pre2-k2/include/linux/i2c.h\n" @@ -327,4 +329,4 @@ "Jean Delvare\n" http://www.ensicaen.ismra.fr/~delvare/ -dee111e99b3339815d7b7b87c78b4c3e3dba1abffe8c96fd68bdfdfe5b5a5d7f +e7c00dd6215350b2a08c7df49ff792c840efb837f39c8ae673ae2fb1bc652caa
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.