diff for duplicates of <00a501cb824f$9942f300$cbc8d900$%dae@samsung.com> diff --git a/a/1.txt b/N1/1.txt index ca21c7d..5337036 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -151,7 +151,8 @@ platform_device *pdev) /* setup registers */ writel(pd->vidcon1, sfb->regs + VIDCON1); -@@ -1656,6 +1671,36 @@ static struct s3c_fb_driverdata s3c_fb_data_s5pv210 { +@@ -1656,6 +1671,36 @@ static struct s3c_fb_driverdata s3c_fb_data_s5pv210 = +{ .win[4] = &s3c_fb_data_64xx_wins[4], }; @@ -188,7 +189,8 @@ platform_device *pdev) /* S3C2443/S3C2416 style hardware */ static struct s3c_fb_driverdata s3c_fb_data_s3c2443 = { .variant = { -@@ -1703,6 +1748,9 @@ static struct platform_device_id s3c_fb_driver_ids[] { +@@ -1703,6 +1748,9 @@ static struct platform_device_id s3c_fb_driver_ids[] = +{ .name = "s5pv210-fb", .driver_data = (unsigned long)&s3c_fb_data_s5pv210, }, { @@ -485,7 +487,8 @@ this code above is unnecessary anymore. > > > > @@ -1656,6 +1720,37 @@ static struct s3c_fb_driverdata > s3c_fb_data_s5pv210 -> > > { +> = +> > { > > .win[4] = &s3c_fb_data_64xx_wins[4], > > }; > > @@ -528,7 +531,8 @@ clk_type is unnecessary anymore. > > .variant = { > > @@ -1703,6 +1798,9 @@ static struct platform_device_id > s3c_fb_driver_ids[] -> > > { +> = +> > { > > .name = "s5pv210-fb", > > .driver_data = (unsigned long)&s3c_fb_data_s5pv210, > > }, { diff --git a/a/content_digest b/N1/content_digest index 16a2b93..95ce118 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,8 +1,17 @@ + "ref\01287406528-15324-1-git-send-email-sbkim73@samsung.com\0" "ref\01287406528-15324-4-git-send-email-sbkim73@samsung.com\0" + "ref\0053f01cb822a$2758a7f0$7609f7d0$%kim@samsung.com\0" "From\0Inki Dae <inki.dae@samsung.com>\0" "Subject\0RE: [PATCH 3/4] s3c-fb: Add support S5PV310 FIMD\0" - "Date\0Fri, 12 Nov 2010 09:54:29 +0000\0" - "To\0linux-fbdev@vger.kernel.org\0" + "Date\0Fri, 12 Nov 2010 18:54:29 +0900\0" + "To\0'Kukjin Kim' <kgene.kim@samsung.com>" + 'Sangbeom Kim' <sbkim73@samsung.com> + linux-arm-kernel@lists.infradead.org + linux-samsung-soc@vger.kernel.org + " linux-fbdev@vger.kernel.org\0" + "Cc\0ben-linux@fluff.org" + akpm@linux-foundation.org + " 'Jonghun Han' <jonghun.han@samsung.com>\0" "\00:1\0" "b\0" "Hello, all.\n" @@ -158,7 +167,8 @@ " \n" " \t/* setup registers */\n" " \twritel(pd->vidcon1, sfb->regs + VIDCON1);\n" - "@@ -1656,6 +1671,36 @@ static struct s3c_fb_driverdata s3c_fb_data_s5pv210 {\n" + "@@ -1656,6 +1671,36 @@ static struct s3c_fb_driverdata s3c_fb_data_s5pv210 =\n" + "{\n" " \t.win[4]\t= &s3c_fb_data_64xx_wins[4],\n" " };\n" " \n" @@ -195,7 +205,8 @@ " /* S3C2443/S3C2416 style hardware */\n" " static struct s3c_fb_driverdata s3c_fb_data_s3c2443 = {\n" " \t.variant = {\n" - "@@ -1703,6 +1748,9 @@ static struct platform_device_id s3c_fb_driver_ids[] {\n" + "@@ -1703,6 +1748,9 @@ static struct platform_device_id s3c_fb_driver_ids[] =\n" + "{\n" " \t\t.name\t\t= \"s5pv210-fb\",\n" " \t\t.driver_data\t= (unsigned long)&s3c_fb_data_s5pv210,\n" " \t}, {\n" @@ -492,7 +503,8 @@ "> >\n" "> > @@ -1656,6 +1720,37 @@ static struct s3c_fb_driverdata\n" "> s3c_fb_data_s5pv210\n" - "> > > {\n" + "> =\n" + "> > {\n" "> > \t.win[4]\t= &s3c_fb_data_64xx_wins[4],\n" "> > };\n" "> >\n" @@ -535,7 +547,8 @@ "> > \t.variant = {\n" "> > @@ -1703,6 +1798,9 @@ static struct platform_device_id\n" "> s3c_fb_driver_ids[]\n" - "> > > {\n" + "> =\n" + "> > {\n" "> > \t\t.name\t\t= \"s5pv210-fb\",\n" "> > \t\t.driver_data\t= (unsigned long)&s3c_fb_data_s5pv210,\n" "> > \t}, {\n" @@ -561,4 +574,4 @@ "> the body of a message to majordomo@vger.kernel.org\n" > More majordomo info at http://vger.kernel.org/majordomo-info.html -df01dadab7c0df028cc0f0c8982f3f867f577a5afd79f5d9aa3dafc24e625aa5 +fd2aa0c62d60242b6dae5485ce27337a343fac787871b7957d75220587662d07
diff --git a/a/1.txt b/N2/1.txt index ca21c7d..a5b53bd 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -151,7 +151,8 @@ platform_device *pdev) /* setup registers */ writel(pd->vidcon1, sfb->regs + VIDCON1); -@@ -1656,6 +1671,36 @@ static struct s3c_fb_driverdata s3c_fb_data_s5pv210 { +@@ -1656,6 +1671,36 @@ static struct s3c_fb_driverdata s3c_fb_data_s5pv210 = +{ .win[4] = &s3c_fb_data_64xx_wins[4], }; @@ -188,7 +189,8 @@ platform_device *pdev) /* S3C2443/S3C2416 style hardware */ static struct s3c_fb_driverdata s3c_fb_data_s3c2443 = { .variant = { -@@ -1703,6 +1748,9 @@ static struct platform_device_id s3c_fb_driver_ids[] { +@@ -1703,6 +1748,9 @@ static struct platform_device_id s3c_fb_driver_ids[] = +{ .name = "s5pv210-fb", .driver_data = (unsigned long)&s3c_fb_data_s5pv210, }, { @@ -200,12 +202,12 @@ platform_device *pdev) }, > -----Original Message----- -> From: linux-fbdev-owner@vger.kernel.org [mailto:linux-fbdev- -> owner@vger.kernel.org] On Behalf Of Kukjin Kim +> From: linux-fbdev-owner at vger.kernel.org [mailto:linux-fbdev- +> owner at vger.kernel.org] On Behalf Of Kukjin Kim > Sent: Friday, November 12, 2010 2:26 PM -> To: 'Sangbeom Kim'; linux-arm-kernel@lists.infradead.org; linux-samsung- -> soc@vger.kernel.org; linux-fbdev@vger.kernel.org -> Cc: ben-linux@fluff.org; akpm@linux-foundation.org; 'Jonghun Han' +> To: 'Sangbeom Kim'; linux-arm-kernel at lists.infradead.org; linux-samsung- +> soc at vger.kernel.org; linux-fbdev at vger.kernel.org +> Cc: ben-linux at fluff.org; akpm at linux-foundation.org; 'Jonghun Han' > Subject: RE: [PATCH 3/4] s3c-fb: Add support S5PV310 FIMD > > Sangbeom Kim wrote: @@ -485,7 +487,8 @@ this code above is unnecessary anymore. > > > > @@ -1656,6 +1720,37 @@ static struct s3c_fb_driverdata > s3c_fb_data_s5pv210 -> > > { +> = +> > { > > .win[4] = &s3c_fb_data_64xx_wins[4], > > }; > > @@ -528,7 +531,8 @@ clk_type is unnecessary anymore. > > .variant = { > > @@ -1703,6 +1798,9 @@ static struct platform_device_id > s3c_fb_driver_ids[] -> > > { +> = +> > { > > .name = "s5pv210-fb", > > .driver_data = (unsigned long)&s3c_fb_data_s5pv210, > > }, { @@ -551,5 +555,5 @@ clk_type is unnecessary anymore. > > -- > To unsubscribe from this list: send the line "unsubscribe linux-fbdev" in -> the body of a message to majordomo@vger.kernel.org +> the body of a message to majordomo at vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/a/content_digest b/N2/content_digest index 16a2b93..d318395 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,8 +1,10 @@ + "ref\01287406528-15324-1-git-send-email-sbkim73@samsung.com\0" "ref\01287406528-15324-4-git-send-email-sbkim73@samsung.com\0" - "From\0Inki Dae <inki.dae@samsung.com>\0" - "Subject\0RE: [PATCH 3/4] s3c-fb: Add support S5PV310 FIMD\0" - "Date\0Fri, 12 Nov 2010 09:54:29 +0000\0" - "To\0linux-fbdev@vger.kernel.org\0" + "ref\0053f01cb822a$2758a7f0$7609f7d0$%kim@samsung.com\0" + "From\0inki.dae@samsung.com (Inki Dae)\0" + "Subject\0[PATCH 3/4] s3c-fb: Add support S5PV310 FIMD\0" + "Date\0Fri, 12 Nov 2010 18:54:29 +0900\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "Hello, all.\n" @@ -158,7 +160,8 @@ " \n" " \t/* setup registers */\n" " \twritel(pd->vidcon1, sfb->regs + VIDCON1);\n" - "@@ -1656,6 +1671,36 @@ static struct s3c_fb_driverdata s3c_fb_data_s5pv210 {\n" + "@@ -1656,6 +1671,36 @@ static struct s3c_fb_driverdata s3c_fb_data_s5pv210 =\n" + "{\n" " \t.win[4]\t= &s3c_fb_data_64xx_wins[4],\n" " };\n" " \n" @@ -195,7 +198,8 @@ " /* S3C2443/S3C2416 style hardware */\n" " static struct s3c_fb_driverdata s3c_fb_data_s3c2443 = {\n" " \t.variant = {\n" - "@@ -1703,6 +1748,9 @@ static struct platform_device_id s3c_fb_driver_ids[] {\n" + "@@ -1703,6 +1748,9 @@ static struct platform_device_id s3c_fb_driver_ids[] =\n" + "{\n" " \t\t.name\t\t= \"s5pv210-fb\",\n" " \t\t.driver_data\t= (unsigned long)&s3c_fb_data_s5pv210,\n" " \t}, {\n" @@ -207,12 +211,12 @@ " \t},\n" "\n" "> -----Original Message-----\n" - "> From: linux-fbdev-owner@vger.kernel.org [mailto:linux-fbdev-\n" - "> owner@vger.kernel.org] On Behalf Of Kukjin Kim\n" + "> From: linux-fbdev-owner at vger.kernel.org [mailto:linux-fbdev-\n" + "> owner at vger.kernel.org] On Behalf Of Kukjin Kim\n" "> Sent: Friday, November 12, 2010 2:26 PM\n" - "> To: 'Sangbeom Kim'; linux-arm-kernel@lists.infradead.org; linux-samsung-\n" - "> soc@vger.kernel.org; linux-fbdev@vger.kernel.org\n" - "> Cc: ben-linux@fluff.org; akpm@linux-foundation.org; 'Jonghun Han'\n" + "> To: 'Sangbeom Kim'; linux-arm-kernel at lists.infradead.org; linux-samsung-\n" + "> soc at vger.kernel.org; linux-fbdev at vger.kernel.org\n" + "> Cc: ben-linux at fluff.org; akpm at linux-foundation.org; 'Jonghun Han'\n" "> Subject: RE: [PATCH 3/4] s3c-fb: Add support S5PV310 FIMD\n" "> \n" "> Sangbeom Kim wrote:\n" @@ -492,7 +496,8 @@ "> >\n" "> > @@ -1656,6 +1720,37 @@ static struct s3c_fb_driverdata\n" "> s3c_fb_data_s5pv210\n" - "> > > {\n" + "> =\n" + "> > {\n" "> > \t.win[4]\t= &s3c_fb_data_64xx_wins[4],\n" "> > };\n" "> >\n" @@ -535,7 +540,8 @@ "> > \t.variant = {\n" "> > @@ -1703,6 +1798,9 @@ static struct platform_device_id\n" "> s3c_fb_driver_ids[]\n" - "> > > {\n" + "> =\n" + "> > {\n" "> > \t\t.name\t\t= \"s5pv210-fb\",\n" "> > \t\t.driver_data\t= (unsigned long)&s3c_fb_data_s5pv210,\n" "> > \t}, {\n" @@ -558,7 +564,7 @@ "> \n" "> --\n" "> To unsubscribe from this list: send the line \"unsubscribe linux-fbdev\" in\n" - "> the body of a message to majordomo@vger.kernel.org\n" + "> the body of a message to majordomo at vger.kernel.org\n" > More majordomo info at http://vger.kernel.org/majordomo-info.html -df01dadab7c0df028cc0f0c8982f3f867f577a5afd79f5d9aa3dafc24e625aa5 +a11a55a00d37e3d41c40c18eb68b36b77d2afd5a948892a9423bba3f31b6a3a7
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.