On Fri, Jun 06, 2014 at 09:50:06PM +0900, Simon Horman wrote:
> On Fri, Jun 06, 2014 at 09:14:01PM +0900, Magnus Damm wrote:

> > I'm not sure about the expected merge order for this kind of change vs
> > queued up stuff in the renesas git tree, but I believe the following
> > patch selects ARCH_HAS_OPP:

> > [PATCH v3] ARM: shmobile: Mark all SoCs in shmobile as CPUFreq, capable

> I propose that we fix that up by adding an incremental patch to
> mach-shmobile via my renesas tree once the dependency (assuming there is
> one) is in Linus's tree.

Yes, the conversion to make ARCH_HAS_OPP unused is in Raphael's tree for
the merge window.  I'd expect this patch to end up going after the merge
window (or at the end I guess).