diff for duplicates of <20030323081515.GI26145@kroah.com> diff --git a/a/1.txt b/N1/1.txt index c25f32e..6cc5957 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -33,7 +33,7 @@ diff -Nru a/drivers/video/matrox/i2c-matroxfb.c b/drivers/video/matrox/i2c-matro if (ACCESS_FBINFO(devflags.dualhead)) { - err = i2c_bus_reg(&m2info->ddc2, minfo, DDC2_DATA, DDC2_CLK, "DDC:fb%u #1 on i2c-matroxfb"); + err = i2c_bus_reg(&m2info->ddc2, minfo, DDC2_DATA, DDC2_CLK, "DDC:fb%u #1"); - if (err = -ENODEV) { + if (err == -ENODEV) { printk(KERN_INFO "i2c-matroxfb: VGA->TV plug detected, DDC unavailable.\n"); } else if (err) printk(KERN_INFO "i2c-matroxfb: Could not register secondary output i2c bus. Continuing anyway.\n"); diff --git a/a/content_digest b/N1/content_digest index 430ed62..9aa4309 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,9 +2,9 @@ "ref\020030323081431.GF26145@kroah.com\0" "ref\020030323081445.GG26145@kroah.com\0" "ref\020030323081456.GH26145@kroah.com\0" - "From\0greg@kroah.com (Greg KH)\0" - "Subject\0[PATCH] Yet more i2c driver changes for 2.5.65\0" - "Date\0Thu, 19 May 2005 06:23:51 +0000\0" + "From\0Greg KH <greg@kroah.com>\0" + "Subject\0Re: [PATCH] Yet more i2c driver changes for 2.5.65\0" + "Date\0Sun, 23 Mar 2003 00:15:15 -0800\0" "To\0linux-kernel@vger.kernel.org" " sensors@stimpy.netroedge.com\0" "\00:1\0" @@ -44,7 +44,7 @@ " \tif (ACCESS_FBINFO(devflags.dualhead)) {\n" "-\t\terr = i2c_bus_reg(&m2info->ddc2, minfo, DDC2_DATA, DDC2_CLK, \"DDC:fb%u #1 on i2c-matroxfb\");\n" "+\t\terr = i2c_bus_reg(&m2info->ddc2, minfo, DDC2_DATA, DDC2_CLK, \"DDC:fb%u #1\");\n" - " \t\tif (err = -ENODEV) {\n" + " \t\tif (err == -ENODEV) {\n" " \t\t\tprintk(KERN_INFO \"i2c-matroxfb: VGA->TV plug detected, DDC unavailable.\\n\");\n" " \t\t} else if (err)\n" " \t\t\tprintk(KERN_INFO \"i2c-matroxfb: Could not register secondary output i2c bus. Continuing anyway.\\n\");\n" @@ -55,4 +55,4 @@ " \t\t\tprintk(KERN_INFO \"i2c-matroxfb: Could not register Maven i2c bus. Continuing anyway.\\n\");\n" " \t}" -2cd18009372db3019d0dcac1b2fdc63702fdc7fc485418838175af09a31651f6 +b15684919fe6ada16232e60e52c8ffed0d888c14d9f02fc9f7d501dd3e8d8175
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.