Message ID | 20090815030208.8312.1837.sendpatchset@rx1.opensource.se (mailing list archive) |
---|---|
State | Accepted |
Headers | show |
On Sat, Aug 15, 2009 at 12:02:08PM +0900, Magnus Damm wrote: > From: Magnus Damm <damm@igel.co.jp> > > This patch simply adds LCDC hwblk_id data for the kfr2r09 board. > > Signed-off-by: Magnus Damm <damm@igel.co.jp> > --- > > Suitable for the sh/hwblk topic branch, but also depends on the > kfr2r09 LCDC patch. I suppose the sh/hwblk stuff needs a rebase? > No, a rebase would make a mess of things given that the topic branch began life from Rafael's tree. A merge is sufficient in this case, which is what I've done. This is now applied, you may wish to make sure nothing else has broken in sh/hwblk. -- To unsubscribe from this list: send the line "unsubscribe linux-sh" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
--- 0004/arch/sh/boards/mach-kfr2r09/setup.c +++ work/arch/sh/boards/mach-kfr2r09/setup.c 2009-08-07 13:22:32.000000000 +0900 @@ -176,6 +176,9 @@ static struct platform_device kfr2r09_sh .dev = { .platform_data = &kfr2r09_sh_lcdc_info, }, + .archdata = { + .hwblk_id = HWBLK_LCDC, + }, }; static struct platform_device *kfr2r09_devices[] __initdata = {