diff for duplicates of <516D554C.1090909@atmel.com> diff --git a/a/1.txt b/N1/1.txt index b4f4107..c24aa08 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -6,7 +6,7 @@ On 04/11/2013 05:00 PM, Jean-Christophe PLAGNIOL-VILLARD : 2 sentences? Simply elaborate the 2nd one and it will be good. > Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> -> Cc: linux-fbdev@vger.kernel.org +> Cc: linux-fbdev at vger.kernel.org > Cc: Nicolas Ferre <nicolas.ferre@atmel.com> > Cc: Andrew Morton <akpm@linux-foundation.org> > --- @@ -50,7 +50,7 @@ is even more self-explanatory... > + > +Example: > + -> + fb0: fb@0x00500000 { +> + fb0: fb at 0x00500000 { > + compatible = "atmel,at91sam9g45-lcdc"; > + reg = <0x00500000 0x1000>; > + interrupts = <23 3 0>; @@ -217,7 +217,7 @@ As said in patch 1/8, this one belongs to this 4/8 patch. > + struct atmel_lcdfb_pdata *pdata = &sinfo->pdata; > + struct fb_var_screeninfo *var = &info->var; > + struct device *dev = &sinfo->pdev->dev; -> + struct device_node *np Þv->of_node; +> + struct device_node *np =dev->of_node; > + struct device_node *display_np; > + struct device_node *timings_np; > + struct display_timings *timings; diff --git a/a/content_digest b/N1/content_digest index aa80d0a..aa174b0 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,9 +1,9 @@ "ref\020130411145741.GB25242@game.jcrosoft.org\0" "ref\01365692422-9565-1-git-send-email-plagnioj@jcrosoft.com\0" "ref\01365692422-9565-4-git-send-email-plagnioj@jcrosoft.com\0" - "From\0Nicolas Ferre <nicolas.ferre@atmel.com>\0" - "Subject\0Re: [PATCH 4/8] video: atmel_lcdfb: add device tree suport\0" - "Date\0Tue, 16 Apr 2013 13:42:36 +0000\0" + "From\0nicolas.ferre@atmel.com (Nicolas Ferre)\0" + "Subject\0[PATCH 4/8] video: atmel_lcdfb: add device tree suport\0" + "Date\0Tue, 16 Apr 2013 15:42:36 +0200\0" "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" @@ -15,7 +15,7 @@ "2 sentences? Simply elaborate the 2nd one and it will be good.\n" "\n" "> Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>\n" - "> Cc: linux-fbdev@vger.kernel.org\n" + "> Cc: linux-fbdev at vger.kernel.org\n" "> Cc: Nicolas Ferre <nicolas.ferre@atmel.com>\n" "> Cc: Andrew Morton <akpm@linux-foundation.org>\n" "> ---\n" @@ -59,7 +59,7 @@ "> +\n" "> +Example:\n" "> +\n" - "> +\tfb0: fb@0x00500000 {\n" + "> +\tfb0: fb at 0x00500000 {\n" "> +\t\tcompatible = \"atmel,at91sam9g45-lcdc\";\n" "> +\t\treg = <0x00500000 0x1000>;\n" "> +\t\tinterrupts = <23 3 0>;\n" @@ -226,7 +226,7 @@ "> +\tstruct atmel_lcdfb_pdata *pdata = &sinfo->pdata;\n" "> +\tstruct fb_var_screeninfo *var = &info->var;\n" "> +\tstruct device *dev = &sinfo->pdev->dev;\n" - "> +\tstruct device_node *np \303\236v->of_node;\n" + "> +\tstruct device_node *np =dev->of_node;\n" "> +\tstruct device_node *display_np;\n" "> +\tstruct device_node *timings_np;\n" "> +\tstruct display_timings *timings;\n" @@ -490,4 +490,4 @@ "-- \n" Nicolas Ferre -ecc0a74a2ce4082db8ba1408e8ec4612956c055c7cd1e37b2572eb0cbb6e3626 +705fc2dc16c03414675533e611ecdb8c0c808413dfb5ab04eaf04adc430ddf04
diff --git a/a/1.txt b/N2/1.txt index b4f4107..7385aad 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -217,7 +217,7 @@ As said in patch 1/8, this one belongs to this 4/8 patch. > + struct atmel_lcdfb_pdata *pdata = &sinfo->pdata; > + struct fb_var_screeninfo *var = &info->var; > + struct device *dev = &sinfo->pdev->dev; -> + struct device_node *np Þv->of_node; +> + struct device_node *np =dev->of_node; > + struct device_node *display_np; > + struct device_node *timings_np; > + struct display_timings *timings; diff --git a/a/content_digest b/N2/content_digest index aa80d0a..70f4d42 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -3,8 +3,12 @@ "ref\01365692422-9565-4-git-send-email-plagnioj@jcrosoft.com\0" "From\0Nicolas Ferre <nicolas.ferre@atmel.com>\0" "Subject\0Re: [PATCH 4/8] video: atmel_lcdfb: add device tree suport\0" - "Date\0Tue, 16 Apr 2013 13:42:36 +0000\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "Date\0Tue, 16 Apr 2013 15:42:36 +0200\0" + "To\0Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>\0" + "Cc\0Andrew Morton <akpm@linux-foundation.org>" + devicetree-discuss@lists.ozlabs.org + linux-fbdev@vger.kernel.org + " linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "On 04/11/2013 05:00 PM, Jean-Christophe PLAGNIOL-VILLARD :\n" @@ -226,7 +230,7 @@ "> +\tstruct atmel_lcdfb_pdata *pdata = &sinfo->pdata;\n" "> +\tstruct fb_var_screeninfo *var = &info->var;\n" "> +\tstruct device *dev = &sinfo->pdev->dev;\n" - "> +\tstruct device_node *np \303\236v->of_node;\n" + "> +\tstruct device_node *np =dev->of_node;\n" "> +\tstruct device_node *display_np;\n" "> +\tstruct device_node *timings_np;\n" "> +\tstruct display_timings *timings;\n" @@ -490,4 +494,4 @@ "-- \n" Nicolas Ferre -ecc0a74a2ce4082db8ba1408e8ec4612956c055c7cd1e37b2572eb0cbb6e3626 +8aeb6035364530ea14801f6d8d84ad878fac41e6066ab4257313247bd1d71916
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.