[PATCH] [ARM] pxa/cm-x300: fix build breakage caused by missing 'select CPU_PXA310'

[Russell King - ARM Linux]

On Tue, Dec 15, 2009 at 06:28:27PM +0200, Mike Rapoport wrote:
> Eric,
> Apparently Igor's patches for CM-X300 were not applied properly. Somehow
> commit db205463fd24c0972ad2c4e4fafb1c76e51b4380
> ([ARM] pxa/cm-x300: add PWM backlight support) introduced 'select HAVE_PWM'
> to MACH_COLIBRY300 rather than CM-X300. I suspect that the same happened with
> the patch that added 'select CPU_PXA310' to MACH_CM_X300. I'm not certain about
> removing PWM support in Colibri, but MACH_CM_X300 need to get fixed.

You need to look at the original commit you mention above, and check
whether it has been applied correctly.  If not, it needs to be reverted
and the correct change applied.

This is one of the problems of patching Kconfig files that grow over
time - diff only gives at most six lines of context (three lines either
side), and it is possible to have those same six lines of context
repeated several times in Kconfig files.  Now add an additional set of
lines towards the start of the Kconfig file, and such a diff will get
incorrectly applied.

Unfortunately, this is one of the down sides to using git apply over
GNU patch - GNU patch will tell you if it applied a patch with an offset.
git tools won't, so it's not obvious if a patch has been mis-applied.