On Thu, Jun 14, 2012 at 9:18 PM, Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> wrote: > > On Thu, Jun 14, 2012 at 03:59:24PM +0530, Santosh Shilimkar wrote: > > From: Aneesh V <aneesh@xxxxxx> > > > > Device tree support for the EMIF driver. > > > > Reviewed-by: Benoit Cousson <b-cousson@xxxxxx> > > Reviewed-by: Grant Likely <grant.likely@xxxxxxxxxxxx> > > Tested-by: Lokesh Vutla <lokeshvutla@xxxxxx> > > Signed-off-by: Aneesh V <aneesh@xxxxxx> > > [santosh.shilimkar@xxxxxx: Rebased against 3.5-rc] > > Signed-off-by: Santosh Shilimkar <santosh.shilimkar@xxxxxx> > > Cc: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> > > Am I the memory maintainer now taking these patches? > I assumed that. With your ack, $subject patch should go along with other 3 OMAP platform patches because of dependency. > > @@ -1267,7 +1534,13 @@ static int __init_or_module emif_probe(struct > > platform_device *pdev) > > struct resource *res; > > int irq; > > > > - emif = get_device_details(pdev); > > +#if defined(CONFIG_OF) > > + if (pdev->dev.of_node) > > + emif = of_get_device_details(pdev->dev.of_node, > > &pdev->dev); > > + else > > +#endif > > + emif = get_device_details(pdev); > > + > > Can't you do this without the #ifdef? > Can be done. Just need to have empty of_get_device_details() for the !CONFIG_OF build to avoid build break. Will fix that. Regards santosh -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
