[GIT PULL] ARM: SoC fixes for 3.12-rc

[Olof Johansson]

On Thu, Sep 19, 2013 at 2:39 PM, Woodhouse, David
<david.woodhouse at intel.com> wrote:
> On Thu, 2013-09-19 at 12:47 -0700, Olof Johansson wrote:
>>
>> - A fix for build breakage in the MTD subsystem for some PXA devices.
>>   David Woodhouse has this patch in his for-next branch but has not been
>>   responding to our requests to send it up so here it is.
>>   I should have amended the commit message to describe the build failure for
>>   CONFIG_OF=n setups, but forgot and now it's down in the stack of commits.
>
> Thanks for pulling that in. Apologies for the screwup.

No worries. You're a busy guy these days.

> We were were working on a better way to fix the litter of #ifdef
> CONFIG_OF which wasn't ready for the merge window so I just left this
> one out since it *appeared* to be entirely cosmetic.

Yeah, the real bug is a missing stub function in the #else case, but
if the ifdef is all going away there's no point in adding it.

The ifdeffery around the match tables is something that Mark Brown
brought up yesterday as well. With ACPI_PTR() and of_match_ptr() we at
least don't need the ifdefs in the struct device, but we do still need
it for the match tables.


-Olof